user_agent_parser 2.7.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36ea17c827ff0d9a4a57841e491bafed8ae2c3a5caea5af858d6cdbb580d897
-  data.tar.gz: 48cce3afc9daaf42f180ce5564c9fc37c5fb288c115e93bb20b6291d43ae452f
+  metadata.gz: a48095209e88dd1c8b49954029334bddecbbb1facb44cbf3b2ed5e700b259541
+  data.tar.gz: 06b14639160f7cdc6f3b0cc0ffc88147cee9cd1b92dc8a10ad61a420edb4a5fb
 SHA512:
-  metadata.gz: 4c695d6238bb7542309a94daaea5149109aca5c0f4a1205d7a078f5182eb2d02ea768bf0884803d59a0d2f4f4f57a5ddbb8750d523469f028fcdc0b88f3f56c4
-  data.tar.gz: 39fa0993955155d19eabb8f31356173bfda97b2e430ce469d895713421c793ad047d327a50f1165e64861064ded84ae977a782fdbef078b6229f1c347b8f2113
+  metadata.gz: 94d1c6ad450918654bf5c6b9e9aaffd6ba3e28a01d17741a4443dc63110c30d310b81654de91297e9ce79ec31de3da40d8088d792cb100aca91d486b5410cf67
+  data.tar.gz: be73315646276e7ab2db8ce86cc54e5802fcd6cff84c8176c2af9db935911f853606edada097ac1ab471c5b9b4557363b27099412388599279790edf10882565

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,24 @@ module UserAgentParser
       parse_ua(user_agent, os, device)
     end
 
-    private
-
-    def load_patterns(path)
-      yml = YAML.load_file(path)
+    def parse_os(user_agent)
+      pattern, match = first_pattern_match(@os_patterns, user_agent)
 
-      # 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
+      if match
+        os_from_pattern_match(pattern, match)
+      else
+        OperatingSystem.new
       end
+    end
+
+    def parse_device(user_agent)
+      pattern, match = first_pattern_match(@device_patterns, user_agent)
 
-      [yml['user_agent_parsers'], yml['os_parsers'], yml['device_parsers']]
+      if match
+        device_from_pattern_match(pattern, match)
+      else
+        Device.new
+      end
     end
 
     def parse_ua(user_agent, os = nil, device = nil)
@@ -60,44 +69,48 @@ module UserAgentParser
       end
     end
 
-    def parse_os(user_agent)
-      pattern, match = first_pattern_match(@os_patterns, user_agent)
+    def patterns_path
+      patterns_paths.first
+    end
+    deprecate :patterns_path, :patterns_paths, 2022, 12
 
-      if match
-        os_from_pattern_match(pattern, match)
-      else
-        OperatingSystem.new
+    private
+
+    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
 
-    def parse_device(user_agent)
-      pattern, match = first_pattern_match(@device_patterns, user_agent)
-
-      if match
-        device_from_pattern_match(pattern, match)
-      else
-        Device.new
+    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
 
-    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
+    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
-    else
-      def first_pattern_match(patterns, value)
-        patterns.each do |pattern|
-          if (match = pattern[:regex].match(value))
-            return [pattern, match]
-          end
-        end
-        nil
+    end
+
+    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/version.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require 'rubygems/version'
+
 module UserAgentParser
   class Version
+    include Comparable
+
     # Private: Regex used to split string version string into major, minor,
     # patch, and patch_minor.
-    SEGMENTS_REGEX = /\d+\-\d+|\d+[a-zA-Z]+$|\d+|[A-Za-z][0-9A-Za-z-]*$/
+    SEGMENTS_REGEX = /\d+\-\d+|\d+[a-zA-Z]+$|\d+|[A-Za-z][0-9A-Za-z-]*$/.freeze
 
     attr_reader :version
     alias to_s version
@@ -45,9 +49,10 @@ module UserAgentParser
         version == other.version
     end
 
-    alias == eql?
+    def <=>(other)
+      Gem::Version.new(version).<=>(Gem::Version.new(other.to_s))
+    end
 
-    # Private
     def segments
       @segments ||= version.scan(SEGMENTS_REGEX)
     end

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