browser_sniffer 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7466e6d392be9a8f030ff7301bfae8aa97ff0f44ebe0e31a7f662b8ddd1c45a5
-  data.tar.gz: 22a24aa5b13e3c663416a4cb015e03c3af315193cdd398945541e18829174df1
+  metadata.gz: beb896967f13a26304b23513f7e2a6e334854afc3187795a7d98698a4b8a2299
+  data.tar.gz: b3be5e1a5068b56d87685129404b8ed369644af58adbd815c6634a8500a23221
 SHA512:
-  metadata.gz: 0f5a4612854ada3f81857d40d536817cb1064aec4dc6f24251d25658923dd91d45230091019defe14c594422004bd053402792a4b312d8fca5a5056b80a71479
-  data.tar.gz: 25b99d22d52f3e8dae0a9aeb345408121dd23076f4a3736dbd147ab398dd5b3490b7b09de7fb8e413664e4170d551c3683e4dc667e7e02d240cb2fd601501730
+  metadata.gz: b0f851fc4026c1f35e905daf515f68cd4755261fe6c1424825170dcaefa207605bdd825b821f865cecad5bcc4d99394b783f6078c29eb37a41d96ee41ccaff07
+  data.tar.gz: bad8fe19eb686b1d4e698805a87790cf4e48f4b0654504c5f6d761d2b7cbc97a82746eacade1cbacd210b2459b3e3065f212315b5045bd4bcbe40be09418535f

data/browser_sniffer.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"

data/lib/browser_sniffer/patterns.rb

@@ -59,6 +59,9 @@ class BrowserSniffer
       ], [:name, :version], [
         # Shopify POS for Android (Native App)
         %r{.*(\sPOS\s-).*\s([\d+\.]+)(\/\d*)*\s}i,
+      ], [[:name, 'Shopify POS'], :version], [
+        # Shopify POS for Android (Native App) New Format
+        %r{(Shopify POS)\/([\d\.]+)[^\/]*\/(Android)\/(\d+)}i,
       ], [[:name, 'Shopify POS'], :version], [
         # Shopify POS for Android (SmartWebView)
         %r{.*(Shopify\sPOS)\s.*Android.*\s([\d+\.]+)(\/\d*)*\s}i,
@@ -73,8 +76,8 @@ class BrowserSniffer
         %r{.*(Shopify POS Next|Shopify POS)\/(?:iOS)\/([\d\.]+) \((iPhone|iPad|iPod)}i
       ], [[:name, 'Shopify POS'], :version], [
         # Shopify Mobile for Android
-        %r{.*(Shopify Mobile)\/Android\/([\d\.]+(?: \(debug(?:|-push)\))?) \(Build (\d+) with API (\d+)}i
-      ], [[:name, 'Shopify Mobile'], :version, :build, :sdk_version], [
+        %r{.*(Shopify Mobile)\/Android\/([\d\.]+)(?: \((debug(?:|-push))\))? \(Build (\d+) with API (\d+)}i
+      ], [[:name, 'Shopify Mobile'], :version, :debug_mode, :build, :sdk_version], [
         # ShopifyFoundation shared library
         /^(ShopifyFoundation)/i,
       ], [:name], [
@@ -332,7 +335,7 @@ class BrowserSniffer
         /(gnu)\s?([\w\.]+)*/i # GNU
       ], [:name, :version, [:type, :linux]], [
         /(cros)\s[\w]+\s([\w\.]+\w)/i # Chromium OS
-      ], [[:name, 'Chromium OS'], :version],[
+      ], [[:name, 'Chromium OS'], :version, [:type, :chromium_os]],[
         # Solaris
         /(sunos)\s?([\w\.]+\d)*/i # Solaris
       ], [[:name, 'Solaris'], :version], [

data/lib/browser_sniffer/version.rb

@@ -1,3 +1,3 @@
 class BrowserSniffer
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/lib/browser_sniffer.rb

@@ -24,6 +24,15 @@ class BrowserSniffer
     browser == :ie && major_browser_version == 11
   end
 
+  # This method checks ie 11 mobile or ie11 rendering an older version in compatibility mode, in addition to `ie11?`.
+  # The `ie11?` method would return false in both those scenarios.
+  def ie11_actual?
+    ie11_engine = major_engine_version == 7 && engine_name == 'Trident'
+    ie_mobile11 = major_browser_version == 11 && browser_name == 'IEMobile'
+
+    ie11? || ie11_engine || ie_mobile11
+  end
+
   def handheld?
     form_factor == :handheld
   end

data/test/browser_sniffer_test.rb

@@ -454,6 +454,7 @@ class BrowserSnifferTest < Minitest::Test
       :android? => false,
       :desktop? => true,
       :ie11? => false,
+      :ie11_actual? => false,
       :engine => nil,
       :major_engine_version => nil,
       :os => :mac,
@@ -467,6 +468,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -481,6 +483,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -495,6 +498,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -509,6 +513,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -523,6 +528,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => false,
+      :ie11_actual? => false,
       :android? => false,
       :desktop? => true,
       :engine => :webkit,
@@ -544,7 +550,52 @@ class BrowserSnifferTest < Minitest::Test
       :os_version => nil,
       :browser => nil,
       :major_browser_version => nil
-    }
+    },
+    :chromiumos_chrome => {
+      :user_agent => "Mozilla/5.0 (X11; CrOS x86_64 10066.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.122 Safari/537.36",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :chromium_os,
+      :os_version => '10066.0.0',
+      :browser => :chrome,
+      :major_browser_version => 81,
+    },
+    :windows_phone_8_1_ie11 => {
+      :user_agent => "Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; " \
+       "Lumia 640 XL) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537",
+      :form_factor => :handheld,
+      :ios? => false,
+      :ie11? => false,
+      :ie11_actual? => true,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 53,
+      :os => :windows,
+      :os_version => "8.1",
+      :browser => nil,
+      :major_browser_version => 11
+    },
+    :win10_ie11_in_ie7_compatibility_mode => {
+      :user_agent => "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; .NET CLR 2.0.50727; " \
+       ".NET CLR 3.0.30729; .NET CLR 3.5.30729; InfoPath.3; Tablet PC 2.0; Zoom 3.6.0)",
+      :form_factor => :desktop,
+      :ios? => false,
+      :ie11? => false,
+      :ie11_actual? => true,
+      :android? => false,
+      :desktop? => true,
+      :engine => :trident,
+      :major_engine_version => 7,
+      :os => :windows,
+      :os_version => "10",
+      :browser => :ie,
+      :major_browser_version => 7
+    },
   }
 
   AGENTS.each do |agent, attributes|

data/test/shopify_agents_test.rb

@@ -155,6 +155,7 @@ describe "Shopify agents" do
     assert_equal ({
       name: 'Shopify Mobile',
       version: '5.4.4',
+      debug_mode: nil,
       build: '12005',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -174,10 +175,11 @@ describe "Shopify agents" do
     "MobileMiddlewareSupported Mozilla/5.0 (Linux; Android 9; Android SDK built for x86 Build/PSR1.180720.075; wv) "\
     "AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/69.0.3497.100 Mobile Safari/537.36"
     sniffer = BrowserSniffer.new(user_agent)
-    
+
     assert_equal ({
       name: 'Shopify Mobile',
       version: '8.12.0',
+      debug_mode: nil,
       build: '12005',
       sdk_version: '28',
     }), sniffer.browser_info
@@ -203,7 +205,8 @@ describe "Shopify agents" do
 
     assert_equal ({
       name: 'Shopify Mobile',
-      version: '6.2.0 (debug)',
+      version: '6.2.0',
+      debug_mode: 'debug',
       build: '1',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -551,13 +554,42 @@ describe "Shopify agents" do
     assert_equal sniffer.os_info, sniffer_with_suffix.os_info
   end
 
+  it "Shopify POS on Android can be sniffed (Native App) New Format" do
+    user_agent = "com.jadedpixel.pos Shopify POS/4.23.0/Android/12/google/Pixel 5/production MobileMiddlewareSupported"
+    sniffer = BrowserSniffer.new(user_agent)
+
+    user_agent_with_mal = "com.jadedpixel.pos Shopify POS/4.23.0-mal+30112/Android/12/google/Android SDK built for " \
+    "x86/development MobileMiddlewareSupported"
+    sniffer_with_suffix = BrowserSniffer.new(user_agent_with_mal)
+
+    assert_equal ({
+      name: 'Shopify POS',
+      version: '4.23.0',
+    }), sniffer.browser_info
+
+    assert_equal ({
+      type: :handheld,
+    }), sniffer.device_info
+
+    assert_equal ({
+      type: :android,
+      version: '12',
+      name: 'Android',
+    }), sniffer.os_info
+
+    assert_equal sniffer.browser_info, sniffer_with_suffix.browser_info
+    assert_equal sniffer.device_info, sniffer_with_suffix.device_info
+    assert_equal sniffer.os_info, sniffer_with_suffix.os_info
+  end
+
   it "Shopify Mobile in debug mode can be parsed" do
     user_agent = "Shopify Mobile/Android/6.0.0 (debug) (Build 1 with API 25 on Unknown Android SDK built for x86)"
     sniffer = BrowserSniffer.new(user_agent)
 
     assert_equal ({
       name: 'Shopify Mobile',
-      version: '6.0.0 (debug)',
+      version: '6.0.0',
+      debug_mode: 'debug',
       build: '1',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -580,7 +612,8 @@ describe "Shopify agents" do
 
     assert_equal ({
       name: 'Shopify Mobile',
-      version: '6.0.0 (debug-push)',
+      version: '6.0.0',
+      debug_mode: 'debug-push',
       build: '1',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -703,7 +736,7 @@ describe "Shopify agents" do
   COMPATIBLE_USER_AGENTS.each do |user_agent|
     it "user agent #{user_agent} is correctly marked as compatible" do
       sniffer = BrowserSniffer.new(user_agent)
-      
+
       assert sniffer.same_site_none_compatible?
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser_sniffer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,8 @@ homepage: https://github.com/Shopify/browser_sniffer
 licenses:
 - GPLv2
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Parses user agent strings and boils it all down to a few simple classifications.