user_agent_parser 2.11.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48c15771051ce967fbd02b30cebe742074d6cc363f202f8136d2da8fcb53eae
-  data.tar.gz: cec1845c163e7d79d232b9216182f08e4a4ca25236c06328afd1aa7262c4b0f6
+  metadata.gz: 5f014ae2d784eb25f63242a361c9c9186ad108c7199fd1655944da1dcfeaff28
+  data.tar.gz: 36357407d451f17dada0fa4115f5f19e8a69af6932a1c3fc999ecd55abc958a0
 SHA512:
-  metadata.gz: f1c6d56ffe6f50176dd812ca4e717a4c2e63079eae3d91dbadb17fbefe6efa825ae05394c02e3de909c8bd5c76587d41ec33bc5c5fa6b283d5f8d9bc08c081b5
-  data.tar.gz: 8f50066203f91d2ac548db3326944c7bca38bb8fc355c7b34e012287e09c0199ce6da8aee707227e5944e482f11d53decd2afef63ba500d564045d6e01dc2158
+  metadata.gz: 1dfc2207de8b2345dcf21a0f271122f96259165fe115397ecb290f9fb07a9924e399554a5f23110c27f24976feae5b189a9a482386bb9f60d74ce542625eda61
+  data.tar.gz: 7abd96ee88bcca1d800323d3d9fd2f508b0b36dc20885a79e5bdfb58154a48a00ed60b0f7750e3eb0fd6570bbbebaac48355f5ba250c35f05ace615c41baa5d5

data/lib/user_agent_parser/parser.rb

@@ -4,6 +4,8 @@ require 'yaml'
 
 module UserAgentParser
   class Parser
+    extend Gem::Deprecate
+
     FAMILY_REPLACEMENT_KEYS = %w[
       family_replacement
       v1_replacement
@@ -22,11 +24,13 @@ module UserAgentParser
 
     private_constant :FAMILY_REPLACEMENT_KEYS, :OS_REPLACEMENT_KEYS
 
-    attr_reader :patterns_path
+    attr_reader :patterns_paths
+
+    def initialize(patterns_path: nil, patterns_paths: [])
+      @patterns_paths = [patterns_path, *patterns_paths].compact
+      @patterns_paths = [UserAgentParser::DefaultPatternsPath] if @patterns_paths.empty?
 
-    def initialize(options = {})
-      @patterns_path = options[:patterns_path] || UserAgentParser::DefaultPatternsPath
-      @ua_patterns, @os_patterns, @device_patterns = load_patterns(patterns_path)
+      @ua_patterns, @os_patterns, @device_patterns = load_patterns(@patterns_paths)
     end
 
     def parse(user_agent)
@@ -35,19 +39,41 @@ module UserAgentParser
       parse_ua(user_agent, os, device)
     end
 
+    def patterns_path
+      patterns_paths.first
+    end
+    deprecate :patterns_path, :patterns_paths, 2022, 12
+
     private
 
-    def load_patterns(path)
-      yml = YAML.load_file(path)
+    def load_patterns(patterns_paths)
+      patterns_paths.each_with_object([[], [], []]) do |path, patterns|
+        ua_patterns, os_patterns, device_patterns = load_patterns_file(path)
+        patterns[0] += ua_patterns
+        patterns[1] += os_patterns
+        patterns[2] += device_patterns
+      end
+    end
 
-      # Parse all the regexs
-      yml.each_pair do |_type, patterns|
-        patterns.each do |pattern|
-          pattern[:regex] = Regexp.new(pattern['regex'], pattern['regex_flag'] == 'i')
-        end
+    def load_patterns_file(path)
+      yml = begin
+        YAML.load_file(path, freeze: true)
+      rescue ArgumentError
+        YAML.load_file(path)
       end
+      [
+        parse_pattern(yml['user_agent_parsers']),
+        parse_pattern(yml['os_parsers']),
+        parse_pattern(yml['device_parsers']),
+      ]
+    end
 
-      [yml['user_agent_parsers'], yml['os_parsers'], yml['device_parsers']]
+    def parse_pattern(patterns)
+      patterns.map do |pattern|
+        pattern = pattern.dup
+        pattern[:regex] = Regexp.new(pattern.delete('regex'), pattern.delete('regex_flag') == 'i')
+        pattern
+      end
     end
 
     def parse_ua(user_agent, os = nil, device = nil)
@@ -80,24 +106,11 @@ module UserAgentParser
       end
     end
 
-    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-      def first_pattern_match(patterns, value)
-        patterns.each do |pattern|
-          if pattern[:regex].match?(value)
-            return [pattern, pattern[:regex].match(value)]
-          end
-        end
-        nil
-      end
-    else
-      def first_pattern_match(patterns, value)
-        patterns.each do |pattern|
-          if (match = pattern[:regex].match(value))
-            return [pattern, match]
-          end
-        end
-        nil
+    def first_pattern_match(patterns, value)
+      patterns.each do |pattern|
+        return [pattern, pattern[:regex].match(value)] if pattern[:regex].match?(value)
       end
+      nil
     end
 
     def user_agent_from_pattern_match(pattern, match, os = nil, device = nil)

data/lib/user_agent_parser.rb

@@ -10,7 +10,7 @@ module UserAgentParser
   DefaultPatternsPath = File.join(File.dirname(__FILE__), '../vendor/uap-core/regexes.yaml')
 
   # Parse the given +user_agent_string+, returning a +UserAgent+
-  def self.parse(user_agent_string, options = {})
-    Parser.new(options).parse(user_agent_string)
+  def self.parse(user_agent_string, **args)
+    Parser.new(**args).parse(user_agent_string)
   end
 end

data/vendor/uap-core/regexes.yaml

@@ -213,6 +213,10 @@ user_agent_parsers:
   - regex: '(Twitter for (?:iPhone|iPad)|TwitterAndroid)(?:\/(\d+)\.(\d+)|)'
     family_replacement: 'Twitter'
 
+  # Phantom app
+  - regex: 'Mozilla.{1,200}Mobile.{1,100}(Phantom\/ios|android).(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Phantom'
+
   # aspiegel.com spider (owned by Huawei)
   - regex: 'Mozilla.{1,100}Mobile.{1,100}AspiegelBot'
     family_replacement: 'Spider'
@@ -381,7 +385,7 @@ user_agent_parsers:
   # Edge Mobile
   - regex: 'Windows Phone .{0,200}(Edge)/(\d+)\.(\d+)'
     family_replacement: 'Edge Mobile'
-  - regex: '(EdgiOS|EdgA)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
+  - regex: '(EdgiOS|EdgA)/(\d+)\.(\d+)\.(\d+)(?:\.(\d+)|)'
     family_replacement: 'Edge Mobile'
 
   # Samsung Internet (based on Chrome, but lacking some features)
@@ -517,6 +521,10 @@ user_agent_parsers:
   # Palo Alto GlobalProtect Linux
   - regex: 'PAN (GlobalProtect)/(\d+)\.(\d+)\.(\d+) .{1,100} \(X11; Linux x86_64\)'
 
+  # Surveyon https://www.surveyon.com/
+  - regex: '^(surveyon)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Surveyon'
+
   #### END SPECIAL CASES TOP ####
 
   #### MAIN CASES - this catches > 50% of all browsers ####
@@ -1120,6 +1128,7 @@ os_parsers:
 
   # Android 9; Android 10;
   - regex: '(Android) (\d+);'
+  - regex: '(Android): (\d+)(?:\.(\d+)(?:\.(\d+)|)|);'
 
   # UCWEB
   - regex: '^UCWEB.{0,200}; (Adr) (\d+)\.(\d+)(?:[.\-]([a-z0-9]{1,100})|);'
@@ -1544,9 +1553,48 @@ os_parsers:
     os_replacement: 'iOS'
     os_v1_replacement: '14'
     os_v2_replacement: '5'
+  - regex: 'CFNetwork/12.{0,100} Darwin/20\.5\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '14'
+    os_v2_replacement: '6'
+  - regex: 'CFNetwork/12.{0,100} Darwin/20\.6\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '14'
+    os_v2_replacement: '8'
   - regex: 'CFNetwork/.{0,100} Darwin/(20)\.\d+'
     os_replacement: 'iOS'
     os_v1_replacement: '14'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.0\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '0'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.1\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '1'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.2\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '2'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.3\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '3'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.4\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '4'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.5\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '5'
+  - regex: 'CFNetwork/13.{0,100} Darwin/21\.6\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
+    os_v2_replacement: '6'
+  - regex: 'CFNetwork/.{0,100} Darwin/(21)\.\d+'
+    os_replacement: 'iOS'
+    os_v1_replacement: '15'
   - regex: 'CFNetwork/.{0,100} Darwin/'
     os_replacement: 'iOS'
 
@@ -2461,10 +2509,6 @@ device_parsers:
     device_replacement: 'Dell $1'
     brand_replacement: 'Dell'
     model_replacement: '$1'
-  - regex: '; {0,2}Dell ([^;/]{1,100}?)(?: Build|\) AppleWebKit)'
-    device_replacement: 'Dell $1'
-    brand_replacement: 'Dell'
-    model_replacement: '$1'
 
   #########
   # Denver
@@ -2671,10 +2715,14 @@ device_parsers:
     device_replacement: '$1'
     brand_replacement: 'Google'
     model_replacement: '$1'
-  - regex: '; {0,2}(Pixel.{0,200}?)(?: Build|\) AppleWebKit)'
-    device_replacement: '$1'
+  - regex: '; {0,2}([g|G]oogle)? (Pixel[ a-zA-z0-9]{1,100});(?: Build|.{0,50}\) AppleWebKit)'
+    device_replacement: '$2'
     brand_replacement: 'Google'
-    model_replacement: '$1'
+    model_replacement: '$2'
+  - regex: '; {0,2}([g|G]oogle)? (Pixel.{0,200}?)(?: Build|\) AppleWebKit)'
+    device_replacement: '$2'
+    brand_replacement: 'Google'
+    model_replacement: '$2'
 
   #########
   # Gigabyte
@@ -3801,6 +3849,18 @@ device_parsers:
     device_replacement: 'OnePlus $1'
     brand_replacement: 'OnePlus'
     model_replacement: '$1'
+  - regex: '; {0,2}(HD1903|GM1917|IN2025|LE2115|LE2127|HD1907|BE2012|BE2025|BE2026|BE2028|BE2029|DE2117|DE2118|EB2101|GM1900|GM1910|GM1915|HD1905|HD1925|IN2015|IN2017|IN2019|KB2005|KB2007|LE2117|LE2125|BE2015|GM1903|HD1900|HD1901|HD1910|HD1913|IN2010|IN2013|IN2020|LE2111|LE2120|LE2121|LE2123|BE2011|IN2023|KB2003|LE2113|NE2215|DN2101)(?: Build|\) AppleWebKit)'
+    device_replacement: 'OnePlus $1'
+    brand_replacement: 'OnePlus'
+    model_replacement: 'OnePlus $1'
+  - regex: '; (OnePlus[ a-zA-z0-9]{0,50});((?: Build|.{0,50}\) AppleWebKit))'
+    device_replacement: '$1'
+    brand_replacement: 'OnePlus'
+    model_replacement: '$1'
+  - regex: '; (OnePlus[ a-zA-z0-9]{0,50})((?: Build|\) AppleWebKit))'
+    device_replacement: '$1'
+    brand_replacement: 'OnePlus'
+    model_replacement: '$1'
 
   #########
   # Orion
@@ -5481,6 +5541,15 @@ device_parsers:
     device_replacement: 'Motorola $1'
     brand_replacement: 'Motorola'
     model_replacement: '$1'
+  - regex: '; (moto[ a-zA-z0-9()]{0,50});((?: Build|.{0,50}\) AppleWebKit))'
+    device_replacement: '$1'
+    brand_replacement: 'Motorola'
+    model_replacement: '$1'
+  - regex: '; {0,2}(moto)(.{0,50})(?: Build|\) AppleWebKit)'
+    device_replacement: 'Motorola$2'
+    brand_replacement: 'Motorola'
+    model_replacement: '$2'
+  
 
   ##########
   # nintendo

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: user_agent_parser
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Tim Lucas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies: []
-description: A simple, comprehensive Ruby gem for parsing user agent strings with
-  the help of BrowserScope's UA database
+description: |
+  A simple, comprehensive Ruby gem for parsing user agent strings
+  with the help of BrowserScope's UserAgent database
 email: t@toolmantim.com
 executables:
 - user_agent_parser
@@ -47,9 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.24
 signing_key:
 specification_version: 4
-summary: A simple, comprehensive Ruby gem for parsing user agent strings with the
-  help of BrowserScope's UA database
+summary: Parsing user agent strings with the help of BrowserScope's UA database
 test_files: []