user_agent_parser 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7994324d50b5df6f804fbdb9af163f3f0f289d2e960c00ea4eacc3db560bba3e
-  data.tar.gz: 168efdf63dfacf1a687e33db092bd226428f3279d995d6bf6b8b89fdd9056121
+  metadata.gz: 5f014ae2d784eb25f63242a361c9c9186ad108c7199fd1655944da1dcfeaff28
+  data.tar.gz: 36357407d451f17dada0fa4115f5f19e8a69af6932a1c3fc999ecd55abc958a0
 SHA512:
-  metadata.gz: 275dfd67d2357655407fa09dcea6959d15bd184cba1f3cd1607108d0a72548c44a2e8d015bd230ed3adcec9036d79035c969a98eb499fe83efbab97360055fea
-  data.tar.gz: 708f4ce8447e4fa0474f5798c4e155699a85555191ffda29ec528c1dd3d835a968520ff9ea88af1c9e3c075bbf4603003a756d5e40b862f7ad8af6607d3e1570
+  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,9 +39,23 @@ 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)
+    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 load_patterns_file(path)
       yml = begin
         YAML.load_file(path, freeze: true)
       rescue ArgumentError
@@ -88,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_agent_parser
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Tim Lucas
@@ -10,8 +10,9 @@ bindir: bin
 cert_chain: []
 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
@@ -50,6 +51,5 @@ requirements: []
 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: []