redmine_apijs 6.9.5 → 6.9.7

data/lib/useragentparser.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 #
-# Copyright 2013-2022 | Jesse G. Donat <donatj~gmail~com>
+# Copyright 2013-2024 | Jesse G. Donat <donatj~gmail~com>
 # https://github.com/donatj/PhpUserAgent
 #
-# Copyright 2019-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
-# https://gist.github.com/luigifab/19a68d9aa98fa80f2961809d7cec59c0 (1.7.0-fork1)
+# Copyright 2019-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# https://gist.github.com/luigifab/19a68d9aa98fa80f2961809d7cec59c0 (1.10.0-fork1)
 #
 # Parses a user agent string into its important parts
 # Licensed under the MIT License
@@ -20,13 +20,13 @@ class Useragentparser
 		browser  = nil
 		version  = nil
 		empty    = {'platform' => platform, 'browser' => browser, 'version' => version}
-		priority = ['Xbox One', 'Xbox', 'Windows Phone', 'Tizen', 'Android', 'FreeBSD', 'NetBSD', 'OpenBSD', 'CrOS', 'X11', 'Sailfish']
+		priority = ['Xbox One', 'Xbox', 'Windows Phone', 'Tizen', 'Android', 'FreeBSD', 'NetBSD', 'OpenBSD', 'CrOS', 'Fuchsia', 'X11', 'Sailfish']
 
 		return empty unless userAgent
 
 		if (parentMatches = userAgent.match(/\((.*?)\)/m))
 			result = parentMatches[1].scan(
-				/(?<platform>BB\d+;|Android|Adr|Symbian|Sailfish|CrOS|Tizen|iPhone|iPad|iPod|Linux|(?:Open|Net|Free)BSD|Macintosh|Windows(?:\ Phone)?|Silk|linux-gnu|BlackBerry|PlayBook|X11|(?:New\ )?Nintendo\ (?:WiiU?|3?DS|Switch)|Xbox(?:\ One)?) (?:\ [^;]*)? (?:;|$)/imx
+				/(?<platform>BB\d+;|Android|Adr|Symbian|Sailfish|CrOS|Fuchsia|Tizen|iPhone|iPad|iPod|Linux|(?:Open|Net|Free)BSD|Macintosh|Windows(?:\ Phone)?|Silk|linux-gnu|BlackBerry|PlayBook|X11|(?:New\ )?Nintendo\ (?:WiiU?|3?DS|Switch)|Xbox(?:\ One)?) (?:\ [^;]*)? (?:;|$)/imx
 			).map(&:join)
 			result.uniq!
 			if result.length > 1
@@ -57,13 +57,13 @@ class Useragentparser
 		end
 
 		result = userAgent.to_enum(:scan, # ["browser" => ["Firefox"...], "version" => ["45.0"...]]
-			/(?<browser>Camino|Kindle(\ Fire)?|Firefox|Iceweasel|IceCat|Safari|MSIE|Trident|AppleWebKit|TizenBrowser|(?:Headless)?Chrome|YaBrowser|Vivaldi|IEMobile|Opera|OPR|Silk|Midori|(?-i:Edge)|EdgA?|CriOS|UCBrowser|Puffin|OculusBrowser|SamsungBrowser|SailfishBrowser|XiaoMi\/MiuiBrowser|Baiduspider|Applebot|Facebot|Googlebot|YandexBot|bingbot|Lynx|Version|Wget|curl|Valve\ Steam\ Tenfoot|NintendoBrowser|PLAYSTATION\ (?:\d|Vita)+)\)?;?(?:[:\/ ](?<version>[\dA-Z.]+)|\/[A-Z]*)/ix
+			/(?<browser>Camino|Kindle(\ Fire)?|Firefox|Thunderbird|Iceweasel|IceCat|Safari|MSIE|Trident|AppleWebKit|TizenBrowser|(?:Headless)?Chrome|YaBrowser|Vivaldi|IEMobile|Opera|OPR|Silk|Midori|(?-i:Edge)|EdgA?|CriOS|UCBrowser|Puffin|OculusBrowser|SamsungBrowser|SailfishBrowser|XiaoMi\/MiuiBrowser|YaApp_Android|Whale|Baiduspider|Applebot|Facebot|Googlebot|YandexBot|bingbot|Lynx|Version|Wget|curl|ChatGPT-User|GPTBot|OAI-SearchBot|Valve\ Steam\ Tenfoot|Mastodon|NintendoBrowser|PLAYSTATION\ (?:\d|Vita)+)\)?;?(?:[\/ :](?<version>[\dA-Z.]+)|\/[A-Z]*)/ix
 		).map { Regexp.last_match.names.collect{ |x| {x => $~[x]} }.reduce({}, :merge) }
 		 .reduce({}) { |h,pairs| pairs.each {|k,v| (h[k] ||= []) << v}; h }
 
 		# If nothing matched, return nil (to avoid undefined index errors)
 		if !result['browser'] || !result['browser'][0] || !result['version'] || !result['version'][0]
-			result = userAgent.match(/^(?!Mozilla)(?<browser>[A-Z\d\-]+)(\/(?<version>[\dA-Z.]+))?/ix)
+			result = userAgent.match(/^(?!Mozilla)(?<browser>[A-Z\d\-]+)([\/ :](?<version>[\dA-Z.]+))?/ix)
 			if result
 				return {
 					'platform' => platform ? platform : nil,
@@ -88,7 +88,7 @@ class Useragentparser
 		refpla = [platform]
 		refval = ['']
 
-		if findt(lowerBrowser, {'OPR' => 'Opera', 'Facebot' => 'iMessageBot', 'UCBrowser' => 'UC Browser', 'YaBrowser' => 'Yandex', 'Iceweasel' => 'Firefox', 'Icecat' => 'Firefox', 'CriOS' => 'Chrome', 'Edg' => 'Edge', 'EdgA' => 'Edge', 'XiaoMi/MiuiBrowser' => 'MiuiBrowser'}, refkey, refbro)
+		if findt(lowerBrowser, {'OPR' => 'Opera', 'Facebot' => 'iMessageBot', 'UCBrowser' => 'UC Browser', 'YaBrowser' => 'Yandex', 'YaApp_Android' => 'Yandex', 'Iceweasel' => 'Firefox', 'Icecat' => 'Firefox', 'CriOS' => 'Chrome', 'Edg' => 'Edge', 'EdgA' => 'Edge', 'XiaoMi/MiuiBrowser' => 'MiuiBrowser'}, refkey, refbro)
 			browser = refbro[0]
 			version = result['version'][refkey[0]][0] =~ /\d/ ? result['version'][refkey[0]] : nil
 		elsif find(lowerBrowser, 'Playstation Vita', refkey, platform)
@@ -124,7 +124,7 @@ class Useragentparser
 					end
 				end
 			end
-		elsif find(lowerBrowser, ['Applebot', 'IEMobile', 'Edge', 'Midori', 'Vivaldi', 'OculusBrowser', 'SamsungBrowser', 'Valve Steam Tenfoot', 'Chrome', 'HeadlessChrome', 'SailfishBrowser'], refkey, refbro)
+		elsif find(lowerBrowser, ['Googlebot', 'Applebot', 'IEMobile', 'Edge', 'Midori', 'Whale', 'Vivaldi', 'OculusBrowser', 'SamsungBrowser', 'Valve Steam Tenfoot', 'Chrome', 'HeadlessChrome', 'SailfishBrowser'], refkey, refbro)
 			version = result['version'][refkey[0]]
 			browser = refbro[0]
 		elsif rv_result && find(lowerBrowser, 'Trident')
@@ -140,9 +140,15 @@ class Useragentparser
 				browser = 'BlackBerry Browser'
 			elsif find(lowerBrowser, 'Safari', refkey, refbro) || find(lowerBrowser, 'TizenBrowser', refkey, refbro)
 				browser = refbro[0]
+				version = result['version'][refkey[0]]
+			elsif result['browser'].length > 0
+				key     = result['browser'].length - 1;
+				browser = result['browser'][key];
+				version = result['version'][key];
+			end
+			if find(lowerBrowser, 'Version', refkey)
+				version = result['version'][refkey[0]]
 			end
-			find(lowerBrowser, 'Version', refkey)
-			version = result['version'][refkey[0]]
 		else
 			pKey = result['browser'].grep(/playstation \d/i)
 			if pKey.length > 0

data/redmine_apijs.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name        = 'redmine_apijs'
-  s.version     = '6.9.5'
+  s.version     = '6.9.7'
   s.summary     = 'Redmine Apijs plugin'
   s.description = 'Integrate the apijs JavaScript library into Redmine. Provides a gallery for image and video attachments. Gem for Redmine 3.0+ (tested with 3.0..5.0), for Redmine 4.1+ read https://redmine.org/issues/31110#note-8'
   s.homepage    = 'https://github.com/luigifab/redmine-apijs'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: redmine_apijs
 version: !ruby/object:Gem::Version
-  version: 6.9.5
+  version: 6.9.7
 platform: ruby
 authors:
 - Fabrice Creuzot
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies: []
 description: Integrate the apijs JavaScript library into Redmine. Provides a gallery
   for image and video attachments. Gem for Redmine 3.0+ (tested with 3.0..5.0), for
@@ -83,7 +82,6 @@ metadata:
   bug_tracker_uri: https://github.com/luigifab/redmine-apijs/issues
   documentation_uri: https://www.luigifab.fr/redmine/apijs
   homepage_uri: https://www.redmine.org/plugins/apijs
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Redmine Apijs plugin
 test_files: []