RubyGems - browser - Versions diffs - 2.7.0 → 2.7.1 - Mend

browser 2.7.0 → 2.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

checksums.yaml +4 -4
data/.rubocop.yml +4 -113
data/.travis.yml +9 -3
data/CHANGELOG.md +6 -0
data/browser.gemspec +8 -6
data/lib/browser/accept_language.rb +5 -7
data/lib/browser/action_controller.rb +1 -3
data/lib/browser/alipay.rb +1 -1
data/lib/browser/base.rb +1 -1
data/lib/browser/blackberry.rb +2 -2
data/lib/browser/bot.rb +4 -6
data/lib/browser/chrome.rb +4 -4
data/lib/browser/detect_version.rb +3 -5
data/lib/browser/device.rb +5 -7
data/lib/browser/device/surface.rb +1 -3
data/lib/browser/edge.rb +2 -2
data/lib/browser/electron.rb +1 -1
data/lib/browser/facebook.rb +2 -2
data/lib/browser/firefox.rb +1 -1
data/lib/browser/generic.rb +3 -5
data/lib/browser/instagram.rb +1 -1
data/lib/browser/internet_explorer.rb +8 -9
data/lib/browser/meta/generic_browser.rb +1 -3
data/lib/browser/micro_messenger.rb +1 -1
data/lib/browser/middleware.rb +1 -1
data/lib/browser/nokia.rb +1 -1
data/lib/browser/opera.rb +2 -2
data/lib/browser/otter.rb +1 -1
data/lib/browser/phantom_js.rb +1 -1
data/lib/browser/platform/adobe_air.rb +1 -1
data/lib/browser/platform/blackberry.rb +1 -1
data/lib/browser/platform/ios.rb +2 -1
data/lib/browser/qq.rb +4 -4
data/lib/browser/rails.rb +1 -3
data/lib/browser/safari.rb +3 -3
data/lib/browser/snapchat.rb +1 -1
data/lib/browser/sputnik.rb +2 -2
data/lib/browser/uc_browser.rb +1 -1
data/lib/browser/version.rb +1 -1
data/lib/browser/weibo.rb +1 -1
data/lib/browser/yandex.rb +1 -1
data/test/sample_app.rb +1 -3
data/test/ua.yml +3 -0
data/test/unit/ios_test.rb +7 -0
data/test/unit/snapchat_test.rb +20 -0
metadata +26 -12

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e06930aa3adaf7fcb64ba7835316a1e621ca68d48b9e7cb628613737e3f2b3c
-  data.tar.gz: 63af8472b567a45c2cc9bf7fcab64522772313fa701c155d536de81ae5e4bc06
+  metadata.gz: 17e665a446ca2a9578cae49ad272bbbc596c29bf8518643cbcec39f2654e4bc4
+  data.tar.gz: 0dd132f6f496e0221417a5b474878823eed6b7e4eac51764f383cd2825cb1969
 SHA512:
-  metadata.gz: f09b0e90fa5df86138f39f549dab4128ae459066a60eeb22e80ec87edf72b7d228c83115dff7f6e6498c8f98f72660ff2c262341ecd1201eb368c52e5be38134
-  data.tar.gz: ddecdb109e863eac0418faaab17b2dbe581fd1d244ab85d3bdbeb6b416b9c20204ef1c39d400c2ac5340cde9960280fc41367e889eee2ef912b819f394ff206c
+  metadata.gz: 2902444a66316eb79ccb9fd409d58d21ac764b6f22a86bb9a2af74791f3bd8c86301a7c7b8829fe17f14a24c0827b3584d0c0a7813f85c9a4022a179ea67db7a
+  data.tar.gz: 1282a961f637a98449d6425272abcd3f005c003908ce37e0954052b3b5fd8bc6bf3d5d75e3104e6d3705823e3abe60f9eb9fca7046bf94f1c16f625cc6a09b07

data/.rubocop.yml CHANGED

@@ -1,6 +1,9 @@
 ---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
 AllCops:
+  TargetRubyVersion: 2.5
   Exclude:
     - bin/**/*
     - gemfiles/**/*
@@ -10,129 +13,17 @@ AllCops:
     - "*.gemspec"
     - config.ru
-Layout/DotPosition:
-  EnforcedStyle: leading
-Layout/RescueEnsureAlignment:
-  Enabled: false
-Layout/SpaceBeforeBlockBraces:
-  EnforcedStyle: space
-Layout/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  SpaceBeforeBlockParameters: false
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false
 Metrics/ClassLength:
   Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false
 Metrics/LineLength:
   Max: 80
 Metrics/MethodLength:
   Enabled: false
-Metrics/ParameterLists:
-  Enabled: false
-Naming/FileName:
-  Enabled: false
-Naming/PredicateName:
-  NamePrefixBlacklist:
-    - is_
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
 Style/Alias:
   EnforcedStyle: prefer_alias_method
-Style/BlockDelimiters:
-  Enabled: false
-Style/ClassCheck:
-  EnforcedStyle: kind_of?
-Style/CollectionMethods:
-  PreferredMethods:
-    collect: map
-    collect!: map!
-    inject: reduce
-    detect: find
-    find_all: select
-Style/Documentation:
-  Enabled: false
-Style/DoubleNegation:
-  Enabled: false
-Style/Encoding:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  EnforcedStyle: always
-Style/IfUnlessModifier:
-  Enabled: false
-Style/ModuleFunction:
-  Enabled: false
-Style/OneLineConditional:
-  Enabled: false
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    "%": "[]"
-    "%i": "[]"
-    "%q": "[]"
-    "%Q": "[]"
-    "%r": "[]"
-    "%s": "[]"
-    "%w": "[]"
-    "%W": "[]"
-    "%x": "[]"
-Style/PerlBackrefs:
-  Enabled: false
-Style/Proc:
-  Enabled: false
-Style/RegexpLiteral:
-  Enabled: false
-Style/SafeNavigation:
-  Enabled: false
-Style/SingleLineBlockParams:
-  Enabled: false
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-  SupportedStyles:
-    - single_quotes
-    - double_quotes
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
-Style/TrailingCommaInHashLiteral:
-  Enabled: false
-Style/VariableInterpolation:
-  Enabled: false
-Style/WhileUntilModifier:
+Lint/RedundantCopDisableDirective:
   Enabled: false

data/.travis.yml CHANGED

@@ -3,8 +3,8 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - "2.6.0"
-  - "2.5.0"
+  - 2.6.0
+  - 2.5.0
 gemfile:
   - Gemfile
   - gemfiles/rails5.gemfile
@@ -12,6 +12,12 @@ gemfile:
 script: bundle exec rake
 notifications:
   email: false
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - "./cc-test-reporter before-build"
+after_script:
+  - "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"
 env:
   global:
-    secure: egPPk/jMVzOoZGkk8jcf1f1N++oI4p4hqtk53T2kpHChxpmR8sP/oFlAhebvqMhM8svbQx+lWTvdxPDj9GBQGsC4ekqubV6S0MNJQS4/F41PSEU+DFUzNU1PHiDO+/0AbIheTj15UIt8IC4NVaM236HuSdMDWOjVI3ydBsgJ/GY=
+    secure: LrxynbbiJMX5vy/UVPfQsnT21oUpqpuHbUM9YOy0+ZYfDCjprvM/UGxFgjM+unRzyPI0mrNyU65ohpj8R1//tvdFW+xYau6QmFgSTU6OAQrckW/n+jqwQZV37a38wEGV0QvA6A0HW9pTrJfatUBmpaAeHAxcaBMk51tEgX/8poA=

data/CHANGELOG.md CHANGED

@@ -2,6 +2,12 @@
 ## Unreleased
+- Handle Snapchat user agents that have a space or an empty string instead of a slash before the version.
+- Fix iOS 10+ version detection.
+- Add fallback versions for instagram and snapchat to avoid NoMethodErrors on unexpected user agents.
+## 2.7.0
 - Add more Slack bots.
 - Handle instagram user agents that have a slash instead of a space.
 - Add `Browser::Bot.why?(ua)` to help debugging why a user agent is considered bot.

data/browser.gemspec CHANGED

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 require "./lib/browser/version"
 Gem::Specification.new do |s|
-  s.required_ruby_version = ">= 2.0"
   s.name                  = "browser"
   s.version               = Browser::VERSION
   s.platform              = Gem::Platform::RUBY
@@ -20,13 +21,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_development_dependency "bundler", ">= 0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rails"
-  s.add_development_dependency "rack-test"
   s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest-autotest"
   s.add_development_dependency "minitest-utils"
   s.add_development_dependency "pry-meta"
-  s.add_development_dependency "minitest-autotest"
-  s.add_development_dependency "simplecov"
+  s.add_development_dependency "rack-test"
+  s.add_development_dependency "rails"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rubocop"
+  s.add_development_dependency "rubocop-fnando"
+  s.add_development_dependency "simplecov"
 end

data/lib/browser/accept_language.rb CHANGED

@@ -34,28 +34,26 @@ module Browser
     def code
       @code ||= begin
         code = part[/\A([^-;]+)/, 1]
-        code.downcase if code
+        code&.downcase
       end
     end
     def region
       @region ||= begin
         region = part[/\A(?:.*?)-([^;-]+)/, 1]
-        region.upcase if region
+        region&.upcase
       end
     end
     def quality
       @quality ||= begin
         Float(quality_value || 1.0)
-      rescue ArgumentError
-        0.1
+                   rescue ArgumentError
+                     0.1
       end
     end
-    private
-    def quality_value
+    private def quality_value
       qvalue = part[/;q=([\d.]+)/, 1]
       qvalue = qvalue =~ /\A0\.0?\z/ ? "0.0" : qvalue
       qvalue = qvalue.gsub(/\.+/, ".") if qvalue

data/lib/browser/action_controller.rb CHANGED

@@ -10,9 +10,7 @@ module Browser
       helper_method(:browser) if respond_to?(:helper_method)
     end
-    private
-    def browser
+    private def browser
       @browser ||= Browser.new(
         request.headers["User-Agent"],
         accept_language: request.headers["Accept-Language"]

data/lib/browser/alipay.rb CHANGED

@@ -11,7 +11,7 @@ module Browser
     end
     def full_version
-      ua[%r[(?:AlipayClient)/([\d.]+)]i, 1] || "0.0"
+      ua[%r{(?:AlipayClient)/([\d.]+)}i, 1] || "0.0"
     end
     def match?

data/lib/browser/base.rb CHANGED

@@ -193,7 +193,7 @@ module Browser
     end
     def webkit_full_version
-      ua[%r[AppleWebKit/([\d.]+)], 1] || "0.0"
+      ua[%r{AppleWebKit/([\d.]+)}, 1] || "0.0"
     end
     def known?

data/lib/browser/blackberry.rb CHANGED

@@ -11,8 +11,8 @@ module Browser
     end
     def full_version
-      ua[%r[BlackBerry[\da-z]+/([\d.]+)], 1] ||
-        ua[%r[Version/([\d.]+)], 1] ||
+      ua[%r{BlackBerry[\da-z]+/([\d.]+)}, 1] ||
+        ua[%r{Version/([\d.]+)}, 1] ||
         "0.0"
     end

data/lib/browser/bot.rb CHANGED

@@ -50,21 +50,19 @@ module Browser
       self.class.bots.find {|key, _| downcased_ua.include?(key) }.last
     end
-    private
-    def bot_with_empty_ua?
+    private def bot_with_empty_ua?
       self.class.detect_empty_ua? && ua.strip == ""
     end
-    def bot_exception?
+    private def bot_exception?
       self.class.bot_exceptions.any? {|key| downcased_ua.include?(key) }
     end
-    def detect_bot?
+    private def detect_bot?
       self.class.bots.any? {|key, _| downcased_ua.include?(key) }
     end
-    def downcased_ua
+    private def downcased_ua
       @downcased_ua ||= ua.downcase
     end
   end

data/lib/browser/chrome.rb CHANGED

@@ -12,10 +12,10 @@ module Browser
     def full_version
       # Each regex on its own line to enforce precedence.
-      ua[%r[Chrome/([\d.]+)], 1] ||
-        ua[%r[CriOS/([\d.]+)], 1] ||
-        ua[%r[Safari/([\d.]+)], 1] ||
-        ua[%r[AppleWebKit/([\d.]+)], 1] ||
+      ua[%r{Chrome/([\d.]+)}, 1] ||
+        ua[%r{CriOS/([\d.]+)}, 1] ||
+        ua[%r{Safari/([\d.]+)}, 1] ||
+        ua[%r{AppleWebKit/([\d.]+)}, 1] ||
         "0.0"
     end

data/lib/browser/detect_version.rb CHANGED

@@ -2,9 +2,7 @@
 module Browser
   module DetectVersion
-    private
-    def detect_version?(actual_version, expected_version)
+    private def detect_version?(actual_version, expected_version)
       return true unless expected_version
       return false if expected_version && !actual_version
@@ -17,8 +15,8 @@ module Browser
       false
     end
-    def parse_version(version)
-      version.kind_of?(Numeric) ? version.to_s : version
+    private def parse_version(version)
+      version.is_a?(Numeric) ? version.to_s : version
     end
   end
 end

data/lib/browser/device.rb CHANGED

@@ -191,19 +191,17 @@ module Browser
       xbox? || playstation? || nintendo?
     end
-    private
     # Regex taken from http://detectmobilebrowsers.com
     # rubocop:disable Metrics/LineLength
-    def detect_mobile?
+    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
-    def platform
+    private def platform
       @platform ||= Platform.new(ua)
     end
   end

data/lib/browser/device/surface.rb CHANGED

@@ -15,9 +15,7 @@ module Browser
         platform.windows_rt? && ua =~ /Touch/
       end
-      private
-      def platform
+      private def platform
         @platform ||= Platform.new(ua)
       end
     end

data/lib/browser/edge.rb CHANGED

@@ -11,11 +11,11 @@ module Browser
     end
     def full_version
-      ua[%r[(?:Edge|Edg)/([\d.]+)], 1] || super
+      ua[%r{(?:Edge|Edg)/([\d.]+)}, 1] || super
     end
     def match?
-      ua =~ %r[((?:Edge|Edg)/[\d.]+|Trident/8)]
+      ua =~ %r{((?:Edge|Edg)/[\d.]+|Trident/8)}
     end
     def chrome_based?

data/lib/browser/electron.rb CHANGED

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

data/lib/browser/facebook.rb CHANGED

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

data/lib/browser/firefox.rb CHANGED

@@ -11,7 +11,7 @@ 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?

data/lib/browser/generic.rb CHANGED

@@ -16,8 +16,8 @@ module Browser
     end
     def full_version
-      ua[%r[(?:QuickTime)/([\d.]+)], 1] ||
-        ua[%r[CoreMedia v([\d.]+)], 1] ||
+      ua[%r{(?:QuickTime)/([\d.]+)}, 1] ||
+        ua[/CoreMedia v([\d.]+)/, 1] ||
         "0.0"
     end
@@ -25,9 +25,7 @@ module Browser
       true
     end
-    private
-    def infer_name
+    private def infer_name
       (NAMES.find {|key, _| ua.include?(key) } || []).last
     end
   end

data/lib/browser/instagram.rb CHANGED

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

data/lib/browser/internet_explorer.rb CHANGED

@@ -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?
+    private def msie?
       ua =~ /MSIE/ && ua !~ /Opera/
     end
-    def modern_ie?
-      ua =~ %r[Trident/.*?; rv:(.*?)]
+    private def modern_ie?
+      ua =~ %r{Trident/.*?; rv:(.*?)}
     end
   end
 end

data/lib/browser/meta/generic_browser.rb CHANGED

@@ -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

data/lib/browser/micro_messenger.rb CHANGED

@@ -11,7 +11,7 @@ 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?

data/lib/browser/middleware.rb CHANGED

@@ -10,7 +10,7 @@ module Browser
       /\.(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|\*/\*)].freeze
+    ACCEPT_REGEX = %r{(text/html|\*/\*)}.freeze
     def initialize(app, &block)
       raise ArgumentError, "Browser::Middleware requires a block" unless block

data/lib/browser/nokia.rb CHANGED

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

data/lib/browser/opera.rb CHANGED

@@ -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 =~ %r{(Opera|OPR/)}
     end
   end
 end

data/lib/browser/otter.rb CHANGED

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

data/lib/browser/phantom_js.rb CHANGED

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

data/lib/browser/platform/adobe_air.rb CHANGED

@@ -8,7 +8,7 @@ module Browser
       end
       def version
-        ua[%r[AdobeAIR/([\d.]+)], 1]
+        ua[%r{AdobeAIR/([\d.]+)}, 1]
       end
       def name

data/lib/browser/platform/blackberry.rb CHANGED

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

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

data/lib/browser/qq.rb CHANGED

@@ -11,10 +11,10 @@ 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

data/lib/browser/rails.rb CHANGED

@@ -12,9 +12,7 @@ module Browser
       ActiveSupport.on_load(:action_controller) do
         ::ActionController::Base.include(Browser::ActionController)
-        if defined?(::ActionController::Metal)
-          ::ActionController::Metal.include(Browser::ActionController)
-        end
+        ::ActionController::Metal.include(Browser::ActionController) if defined?(::ActionController::Metal) # rubocop:disable Metrics/LineLength
         Browser::Middleware::Context.include(
           Browser::Middleware::Context::Additions

data/lib/browser/safari.rb CHANGED

@@ -11,9 +11,9 @@ 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

data/lib/browser/snapchat.rb CHANGED

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

data/lib/browser/sputnik.rb CHANGED

@@ -12,8 +12,8 @@ module Browser
     def full_version
       # Each regex on its own line to enforce precedence.
-      ua[%r[SputnikBrowser/([\d.]+)], 1] ||
-        ua[%r[Chrome/([\d.]+)], 1] ||
+      ua[%r{SputnikBrowser/([\d.]+)}, 1] ||
+        ua[%r{Chrome/([\d.]+)}, 1] ||
         "0.0"
     end

data/lib/browser/uc_browser.rb CHANGED

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

data/lib/browser/version.rb CHANGED

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

data/lib/browser/weibo.rb CHANGED

@@ -11,7 +11,7 @@ module Browser
     end
     def full_version
-      ua[%r[(?:__weibo__)([\d.]+)]i, 1] || "0.0"
+      ua[/(?:__weibo__)([\d.]+)/i, 1] || "0.0"
     end
     def match?

data/lib/browser/yandex.rb CHANGED

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

data/test/sample_app.rb CHANGED

@@ -25,9 +25,7 @@ class SampleApp < Rails::Application
   config.active_support.deprecation = :log
   # Introduced by Rails 6.
-  if config.respond_to?(:hosts)
-    config.hosts << "example.org"
-  end
+  config.hosts << "example.org" if config.respond_to?(:hosts)
   routes.append do
     default_headers = {"Content-Type" => "text/html"}

data/test/ua.yml CHANGED

@@ -66,6 +66,7 @@ IOS8: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4
 IOS8_1_2: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B440 Safari/600.1.4'
 IOS8_3: 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12F70 Safari/600.1.4'
 IOS9: "Mozilla/5.0 (iPad; CPU OS 9_0 like Mac OS X) AppleWebKit/601.1.17 (KHTML, like Gecko) Version/8.0 Mobile/13A175 Safari/600.1.4"
+IOS12: "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1"
 IOS_WEBVIEW: Mozilla/5.0 (iPhone; CPU iPhone OS 8_4 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12H141
 IPAD: "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10"
 IPHONE: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/1A542a Safari/419.3"
@@ -120,6 +121,8 @@ SAMSUNG: "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; SAMSUNG-SGH-I497 Build/IM
 SAMSUNG_CHROME: "Mozilla/5.0 (Linux; Android 4.4.2; en-gb; SAMSUNG GT-I9195/I9195XXUCNEA Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Mobile Safari/537.36"
 SMART_TV: "Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV) AppleWebKit/531.2+ (KHTML, like Gecko) WebBrowser/1.0 SmartTV Safari/531.2+"
 SNAPCHAT: Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Snapchat/10.69.5.72 (iPhone10,3; iOS 13.2.2; gzip)
+SNAPCHAT_SPACE_VERSION: "Mozilla/5.0 (Linux; Android 9; SM-N960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.96 Mobile Safari/537.36Snapchat 10.70.0.0 (SM-N960U; Android 9#N960USQS3CSJ2#28; gzip)"
+SNAPCHAT_EMPTY_STRING_VERSION: "Mozilla/5.0 (Linux; Android 9; SM-N960U Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.96 Mobile Safari/537.36Snapchat10.70.0.0 (SM-N960U; Android 9#N960USQS3CSJ2#28; gzip)"
 SPUTNIK: "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 SputnikBrowser/4.1.2801.0 Safari/537.36"
 SURFACE: "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0; Touch)"
 SYMBIAN: "Nokia5250/10.0.011 (SymbianOS/9.4; U; Series60/5.0 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML, like Gecko) Safari/525 3gpp-gba"

data/test/unit/ios_test.rb CHANGED

@@ -105,6 +105,13 @@ class IosTest < Minitest::Test
     refute browser.platform.mac?
   end
+  test "detects ios12" do
+    browser = Browser.new(Browser["IOS12"])
+    assert browser.platform.ios?
+    assert browser.platform.ios?(12)
+    refute browser.platform.mac?
+  end
   test "don't detect as two different versions" do
     browser = Browser.new(Browser["IOS8"])
     assert browser.platform.ios?(8)

data/test/unit/snapchat_test.rb CHANGED

@@ -13,6 +13,26 @@ class SnapchatTest < Minitest::Test
     assert_equal "10", browser.version
   end
+  test "detects snapchat for badly formatted user agent" do
+    browser = Browser.new(Browser["SNAPCHAT_EMPTY_STRING_VERSION"])
+    assert_equal "Snapchat", browser.name
+    assert browser.snapchat?
+    assert :snapchat, browser.id
+    assert_equal "10.70.0.0", browser.full_version
+    assert_equal "10", browser.version
+  end
+  test "detects alternate snapchat user agent" do
+    browser = Browser.new(Browser["SNAPCHAT_SPACE_VERSION"])
+    assert_equal "Snapchat", browser.name
+    assert browser.snapchat?
+    assert :snapchat, browser.id
+    assert_equal "10.70.0.0", browser.full_version
+    assert_equal "10", browser.version
+  end
   test "detects version by range" do
     browser = Browser.new(Browser["SNAPCHAT"])
     assert browser.snapchat?(%w[>=10])

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-utils
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-meta
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-autotest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-fnando
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -317,7 +331,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="