redmine_apijs 6.8.2 → 6.9.0

data/config/locales/tr.yml

@@ -1,7 +1,7 @@
 tr:
-  apijs_check_extension: "The file extension can not be changed."
-  apijs_clearcache_done: "The image cache was cleaned."
-  apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
+  apijs_check_extension: "Dosya uzantısı değiştirilemez."
+  apijs_clearcache_done: "Resim ön belleği temizlendi."
+  apijs_browser_warning: "<strong>UYARI :</strong> tarayıcınız <strong>%{n} %{v}</strong> eski, lütfen <a %{l}>güncelleyiniz</a>."
   apijs_title_album: "Fotoğraf Galerisi"
   apijs_title_download: "İndir (%{v})"
   apijs_title_files: "Eklenti listesi"
@@ -10,25 +10,25 @@ tr:
   apijs_example1_title: "PHP Kılavuzu"
   apijs_example1_text: "Yalnız şuna dikkat edin : Epostanın sunucu tarafından teslim alınması, epostanın alıcısına ulaştığı anlamına gelmez."
   apijs_example: "Örnek %{v}"
-  apijs_example2_title: "Surprise!"
-  apijs_example2_text: "You are watching this video without proprietary extension thanks to the new [em]video[/em] tag included in the [strong]HTML 5[/strong] language."
+  apijs_example2_title: "Sürpriz!"
+  apijs_example2_text: "Bu videoyu [strong]HTML 5[/strong] dilindeki [em]video[/em] tanımlayıcısı sayesinde herhangi bir eklentiye ihtiyaç olmadan izlemektesiniz."
   apijs_example2_link: "Web sitesi : %{v}"
   apijs_config_sort_order: "Eklentileri alfabetik olarak sırala"
-  apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
-  permission_edit_attachments: "(apijs) Eklenti açıklamalarını düzenle"
-  permission_rename_attachments: "(apijs) Rename files"
-  permission_delete_attachments: "(apijs) Eklenti Sil"
-  apijs_config_directories: "Directories size"
-  apijs_config_clearcache: "clear cache"
+  apijs_config_browser: "Tarayıcı versiyonunu kontrol et"
+  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (apijs etkin değilken de kontrol edilir)."
+  permission_edit_attachments: "(apijs) Açıklama düzenle"
+  permission_rename_attachments: "(apijs) Dosya adı değiştir"
+  permission_delete_attachments: "(apijs) Dosya Sil"
+  apijs_config_directories: "Klasör boyutu"
+  apijs_config_clearcache: "önbelleği temizle"
   apijs_config_album: "Fotoğraf Albümü"
   apijs_config_show_album: "Fotoğraf albümünü görüntüle"
-  apijs_config_show_album_infos: "Display all information"
+  apijs_config_show_album_infos: "Tüm bilgileri göster"
   apijs_config_show_filename: "Fotoğraf adını göster"
   apijs_config_show_exifdate: "Fotoğraf tarihini göster"
-  apijs_config_mimetypes: "Use the following files"
+  apijs_config_mimetypes: "Bu dosyaları kullan"
   apijs_config_album_exclude_name: "Fotoğraf isimleri bununla<br />başlayanları hariç tur"
   apijs_config_album_exclude_desc: "Fotoğraf açıklamaları bunlarla<br />başlayanları hariç tut"
-  apijs_config_create_all: "Generate the three images"
+  apijs_config_create_all: "Ağaç görünümü oluştur"
   apijs_config_create_all_info: "Simge görüntüsünü ve ön görünümü aynı anda oluşturmak sayfayı ilk görüntülemeyi yavaşlatır fakat slayt gösterisini hızlandırır."
   apijs_config_programs: "Program versiyonu"

data/config/locales/uk.yml

@@ -1,6 +1,6 @@
 uk:
   apijs_check_extension: "The file extension can not be changed."
-  apijs_clearcache_done: "The image cache was cleaned."
+  apijs_clearcache_done: "Кеш зображення було очищено."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Photo gallery"
   apijs_title_download: "Завантажити (%{v})"

data/config/locales/zh.yml

@@ -1,6 +1,6 @@
 zh:
   apijs_check_extension: "The file extension can not be changed."
-  apijs_clearcache_done: "The image cache was cleaned."
+  apijs_clearcache_done: "图片缓存被清除了。"
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "照片库"
   apijs_title_download: "下载（%{v}）"

data/init.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # Created L/21/05/2012
-# Updated V/22/10/2021
+# Updated M/05/07/2022
 #
 # Copyright 2008-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
@@ -15,18 +15,38 @@
 # merchantability or fitness for a particular purpose. See the
 # GNU General Public License (GPL) for more details.
 
-require 'redmine'
-require 'apijs_const'
-require 'apijs_files'
-require 'apijs_attachment'
-require 'useragentparser'
+if Rails::VERSION::MAJOR < 6 or ENV['redmine_apijs_gem']
+  require 'redmine'
+  require 'apijs_files'
+  require 'apijs_attachment'
+  require 'useragentparser'
+end
+
+if Redmine::VERSION::MAJOR >= 3
+  if defined? Redmine.root
+    ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(Redmine.root, 'files')
+    APIJS_ROOT = File.join(Redmine.root, 'tmp', 'apijs')
+  else
+    ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, 'files')
+    APIJS_ROOT = File.join(Rails.root, 'tmp', 'apijs')
+  end
+elsif ENV['RAILS_TMP']
+  ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(ENV['RAILS_VAR'], 'files')
+  APIJS_ROOT = File.join(ENV['RAILS_TMP'], 'tmp', 'apijs')
+elsif ENV['RAILS_CACHE']
+  ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(ENV['RAILS_VAR'], 'files')
+  APIJS_ROOT = File.join(ENV['RAILS_CACHE'], 'tmp', 'apijs')
+else
+  ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, 'files')
+  APIJS_ROOT = File.join(Rails.root, 'tmp', 'apijs')
+end
 
 Redmine::Plugin.register :redmine_apijs do
 
   name 'Redmine Apijs plugin'
   author 'Fabrice Creuzot'
   description 'Integrate the apijs JavaScript library into Redmine. Provides a gallery for image and video attachments.'
-  version '6.8.2-gem'
+  version '6.9.0-gem'
   url 'https://www.luigifab.fr/redmine/apijs'
   author_url 'https://www.luigifab.fr/'
 

data/lib/apijs_attachment.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # Created V/27/12/2013
-# Updated J/18/02/2021
+# Updated J/21/04/2022
 #
 # Copyright 2008-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
@@ -182,7 +182,7 @@ module ApijsAttachment
       cmd = getPython
       cmd = 'notfound' if not cmd or cmd.length == 0
 
-      script = File.join(File.dirname(__FILE__), (self.isPhoto? ? 'image.py' : 'video.py'))
+      script = File.join(File.dirname(__FILE__), 'image.py')
       return cmd + ' ' + script.to_s + ' ' + source.to_s + ' ' + target.to_s + ' ' +
         width.to_s + ' ' + height.to_s + (fixed ? ' 90 fixed' : ' 90') + ' 2>&1'
     end
@@ -232,7 +232,7 @@ module ApijsAttachment
         logger.info 'APIJS::ApijsAttachment#update_date: ' + cmd + ' (' + result + ')'
 
         # 2014:06:14 16:43:53 (utilise le fuseau horaire de l'utilisateur)
-        if result =~ /^[0-9]{4}.[0-9]{2}.[0-9]{2} [0-9]{2}.[0-9]{2}.[0-9]{2}/
+        if result =~ /^\d{4}.\d{2}.\d{2} \d{2}.\d{2}.\d{2}/
 
           date = result[0..9].gsub(':', '-') + ' ' + result[11..18]
           zone = User.current.time_zone

data/lib/image.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf8 -*-
 # Created J/26/12/2013
-# Updated M/11/05/2021
+# Updated M/05/07/2022
 #
 # Copyright 2008-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # Copyright 2020-2022 | Fabrice Creuzot <fabrice~cellublue~com>
@@ -17,25 +17,31 @@
 # merchantability or fitness for a particular purpose. See the
 # GNU General Public License (GPL) for more details.
 
-import os
-import sys
+import os, sys
 
 try:
 	filein  = str(sys.argv[1])
 	fileout = str(sys.argv[2])
 	size    = (int(sys.argv[3]), int(sys.argv[4]))
-	quality = int(sys.argv[5])
-	fixed   = len(sys.argv) == 7 and sys.argv[6] == 'fixed'
+	quality = int(sys.argv[5]) if len(sys.argv) >= 6 else 0
+	fixed   = len(sys.argv) >= 7 and sys.argv[6] == 'fixed'
 except:
 	print("Usage: image.py source destination width height [quality=0=auto] [fixed]")
-	print("source: all supported format by python-pil (including animated gif/png/webp) or svg")
-	print("destination: jpg,png,gif,webp or svg")
+	print("source: all supported format by python-pil (including animated gif/png/webp),")
+	print("     or all supported format by ffmpegthumbnailer,")
+	print("     or svg")
+	print("destination: jpg,gif,png,webp or svg")
 	exit(-1)
 
+# https://stackoverflow.com/a/273227/2980105
 if not os.path.exists(os.path.dirname(fileout)):
-	os.makedirs(os.path.dirname(fileout))
+	os.makedirs(os.path.dirname(fileout), exist_ok=True)
 
+same    = filein == fileout
 fileout = fileout + '.save'
+if os.path.isfile(fileout):
+	exit(0)
+os.close(os.open(fileout, os.O_CREAT))
 
 
 # tools
@@ -55,10 +61,13 @@ def calcSize(source, size):
 
 def createThumb(source, size, fixed, new=False):
 
+	# https://pillow.readthedocs.io/en/latest/releasenotes/7.0.0.html?highlight=thumbnail (reducing_gap)
 	# https://pillow.readthedocs.io/en/latest/reference/Image.html#PIL.Image.Image.thumbnail
 	# https://pillow.readthedocs.io/en/latest/handbook/concepts.html#filters-comparison-table
 	# https://pillow.readthedocs.io/en/latest/reference/Image.html#PIL.Image.Image.paste
-	if hasattr(Image, '__version__') and versionTuple(Image.__version__) > (7,0,0):
+	if hasattr(Image, '__version__') and versionTuple(Image.__version__) >= (9,1,0):
+		source.thumbnail(size, Image.Resampling.LANCZOS, 4)
+	elif hasattr(Image, '__version__') and versionTuple(Image.__version__) >= (7,0,0):
 		source.thumbnail(size, Image.LANCZOS, 4)
 	else:
 		source.thumbnail(size, Image.ANTIALIAS)
@@ -80,6 +89,31 @@ def createThumb(source, size, fixed, new=False):
 
 	return dest
 
+def videoToImage(filein, fileout, size):
+
+	os.system('ffmpegthumbnailer -i ' + filein + ' -o ' + fileout + ' -q 10 -s ' + str(size[0]))
+	if os.path.isfile(fileout) and os.path.getsize(fileout) > 0:
+		img = Image.open(fileout)
+	else:
+		img = Image.new('RGBA', size, (0,0,0,0))
+
+	return img
+
+def hasTransparency(img):
+
+	# https://stackoverflow.com/a/58567453/2980105
+	if img.mode == 'P':
+		transparent = img.info.get('transparency', -1)
+		for _, index in img.getcolors():
+			if index == transparent:
+				return True
+	elif img.mode == 'RGBA':
+		extrema = img.getextrema()
+		if extrema[3][0] < 255:
+			return True
+
+	return False
+
 
 # Animated resizing
 # based on https://stackoverflow.com/a/41827681/2980105
@@ -94,8 +128,12 @@ def resizeAnimatedGif(source, size, fixed):
 		while True:
 			# If the GIF uses local colour tables, each frame will have its own palette.
 			# If not, we need to apply the global palette to the new frame.
-			if not source.getpalette():
-				source.putpalette(colors)
+			# Ignore ValueError (illegal image mode)
+			try:
+				if not source.getpalette():
+					source.putpalette(colors)
+			except ValueError:
+				pass
 
 			frame = Image.new('RGBA', source.size, (255,255,255,1))
 			frame.paste(source, (0,0), source.convert('RGBA'))
@@ -211,6 +249,14 @@ def saveJpg(dest, fileout, quality):
 	elif quality > 95:
 		quality = 95
 
+	# https://github.com/wanadev/pyguetzli
+	# warning: extremely slow performance (https://github.com/google/guetzli/issues/50)
+	#try:
+	#	import pyguetzli
+	#	filefinal = pyguetzli.process_pil_image(dest.convert('RGB'), quality)
+	#	output = open(fileout, "wb")
+	#	output.write(filefinal)
+	#except ImportError:
 	dest.convert('RGB').save(fileout, 'JPEG', optimize=True, subsampling=0, quality=quality)
 
 
@@ -227,21 +273,75 @@ if ".svg" in fileout:
 # python-pil
 else:
 	from PIL import Image, ImageSequence
-	source = Image.open(filein)
-	size   = calcSize(source, size)
 
-	if   source.format == 'GIF'  and ".gif"  in fileout:
+	if ".ogv" in filein or ".webm" in filein or ".mp4" in filein:
+		# from video
+		source = videoToImage(filein, fileout, size)
+		imgext = 'VIDEO'
+	else:
+		# from image
+		source = Image.open(filein)
+		imgext = source.format
+		size   = calcSize(source, size)
+
+	# filein = fileout = /tmp/phpA5kbkc  when replace tmp image with re-sampled copy to exclude images with malicious data
+	if   imgext == 'GIF'  and (same or ".gif"  in fileout):
 		dest = resizeAnimatedGif(source, size, fixed)
 		saveGif(dest, fileout, quality)
-	elif source.format == 'PNG'  and ".png"  in fileout:
+	elif imgext == 'PNG'  and (same or ".png"  in fileout):
 		dest = resizeAnimatedPng(source, size, fixed)
 		savePng(dest, fileout, quality)
-	elif source.format == 'WEBP' and ".webp" in fileout:
-		dest = resizeAnimatedWeb(source, size, fixed)
+	elif imgext == 'WEBP' and (same or ".webp" in fileout):
+		dest = resizeAnimatedWebp(source, size, fixed)
 		saveWebp(dest, fileout, quality)
 	else:
-		dest = createThumb(source, size, fixed, True)
-		saveJpg(dest, fileout, quality)
+		if imgext == 'VIDEO':
+			# from video
+			offset_x = max(int((size[0] - source.size[0]) / 2), 0)
+			offset_y = max(int((size[1] - source.size[1]) / 2), 0)
+			# Color detection
+			# white background black player OR black background white player
+			pixels = source.getcolors(size[0] * size[1])
+			pixels = sorted(pixels, key=lambda t: t[0])
+			if (pixels[-1][1] > (127,127,127)):
+				dest = Image.new('RGBA', size, (255,255,255,0))
+				dest.paste(source, (offset_x, offset_y))
+				# https://stackoverflow.com/a/59082116 (replace only last lib)
+				# /var/lib/gems/xyz/gems/redmine_apijs-xyz/lib » /var/lib/gems/xyz/gems/redmine_apijs-xyz/assets/images/...
+				path = os.path.dirname(__file__)
+				path = ('/assets/images/apijs/player-black-' + str(size[0]) + '.png').join(path.rsplit('/lib', 1))
+				play = Image.open(path)
+				dest.paste(play, (0, 0), play)
+			else:
+				dest = Image.new('RGBA', size, (0,0,0,0))
+				dest.paste(source, (offset_x, offset_y))
+				# https://stackoverflow.com/a/59082116 (replace only last lib)
+				# /var/lib/gems/xyz/gems/redmine_apijs-xyz/lib » /var/lib/gems/xyz/gems/redmine_apijs-xyz/assets/images/...
+				path = os.path.dirname(__file__)
+				path = ('/assets/images/apijs/player-white-' + str(size[0]) + '.png').join(path.rsplit('/lib', 1))
+				play = Image.open(path)
+				dest.paste(play, (0, 0), play)
+		else:
+			# from image
+			# Auto rotate image
+			# https://github.com/python-pillow/Pillow/commit/1ba774ae7faf93355b85c7b005fbaf0b0e66d426
+			if hasattr(Image, '__version__') and versionTuple(Image.__version__) >= (6,0,0) and source.getexif().get(0x0112):
+				from PIL import ImageOps
+				source = ImageOps.exif_transpose(source)
+			# create thumbnail
+			dest = createThumb(source, size, fixed, True)
+
+		if hasTransparency(source) is False:
+			dest = dest.convert('RGB')
+
+		if ".gif"    in fileout or (same and imgext == 'GIF'):
+			saveGif(dest, fileout, quality)
+		elif ".png"  in fileout or (same and imgext == 'PNG'):
+			savePng(dest, fileout, quality)
+		elif ".webp" in fileout or (same and imgext == 'WEBP'):
+			saveWebp(dest, fileout, quality)
+		else:
+			saveJpg(dest, fileout, quality)
 
 if os.path.isfile(fileout):
 	os.rename(fileout, fileout.replace('.save', ''))

data/lib/redmine_apijs.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # Created L/13/07/2020
-# Updated D/27/08/2020
+# Updated M/05/07/2022
 #
 # Copyright 2008-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
@@ -20,29 +20,52 @@ require 'rails/engine'
 module RedmineApijs
 
   class Plugin < ::Rails::Engine
+
     config.after_initialize do
 
-      # Gemify redmine plugin (https://github.com/koppen/redmine_github_hook/commit/a82bcccfd0731503509771d3f715d8fb1e6f1bfe)
+      # for Redmine 5.0+ with Rails 6.0+
+      ENV['redmine_apijs_gem'] = 'yes'
+
+      # Gemify redmine plugin (based on https://github.com/koppen/redmine_github_hook/commit/a82bcccfd0731503509771d3f715d8fb1e6f1bfe)
+      # it works out of box with Redmine 3.0 - 4.0, for Redmine 4.1+ see https://www.redmine.org/issues/31110
       # run the classic redmine plugin initializer after rails boot
       require File.expand_path('../../init', __FILE__)
       ::ActionController::Base.prepend_view_path(File.expand_path('../../app/views/', __FILE__))
 
       # and copy plugin assets
       unless ::Redmine::Configuration['mirror_plugins_assets_on_startup'] == false
-        module ::Redmine
-          class Plugin
-            def assets_directory
-              if directory =~ /redmine_apijs/
-                File.join(File.expand_path('../../', __FILE__), 'assets')
-              else
-                File.join(directory, 'assets')
+        if Redmine::VERSION::MAJOR >= 5
+          # https://github.com/redmine/redmine/blob/9aa34eb651e2941aeae69cc3acf6e1c1b909729e/lib/redmine/plugin_loader.rb#L41
+          # Update the name of the plugin directory
+          module ::Redmine
+            class PluginPath
+              def update_dir(dir)
+                @dir = dir
+              end
+            end
+          end
+          # go
+          obj = Redmine::PluginPath.new(File.expand_path('../../', __FILE__))
+          obj.update_dir('redmine_apijs')
+          obj.mirror_assets
+        else
+          # https://github.com/redmine/redmine/blob/94f3510036690d049ac7425d19fa7c055044ae57/lib/redmine/plugin.rb#L207
+          # Returns the absolute path to the plugin assets directory
+          module ::Redmine
+            class Plugin
+              def assets_directory
+                if directory =~ /redmine_apijs/
+                  File.join(File.expand_path('../../', __FILE__), 'assets')
+                else
+                  File.join(directory, 'assets')
+                end
               end
             end
           end
+          # go
+          Redmine::Plugin.mirror_assets('redmine_apijs')
         end
-        Redmine::Plugin.mirror_assets('redmine_apijs')
       end
-
     end
   end
 end

data/lib/useragentparser.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 #
-# Copyright 2013-2021 | Jesse G. Donat <donatj~gmail~com>
+# Copyright 2013-2022 | Jesse G. Donat <donatj~gmail~com>
 # https://github.com/donatj/PhpUserAgent
 #
-# Copyright 2019-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
-# https://gist.github.com/luigifab/19a68d9aa98fa80f2961809d7cec59c0 (1.5.0-fork1)
+# Copyright 2019-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# https://gist.github.com/luigifab/19a68d9aa98fa80f2961809d7cec59c0 (1.6.1-fork1)
 #
 # Parses a user agent string into its important parts
 # Licensed under the MIT License
@@ -49,13 +49,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|Edge|Edg|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>[0-9A-Z.]+)|\/[A-Z]*)/ix
+			/(?<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
 		).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-Z0-9\-]+)(\/(?<version>[0-9A-Z.]+))?/ix)
+			result = userAgent.match(/^(?!Mozilla)(?<browser>[A-Z\d\-]+)(\/(?<version>[\dA-Z.]+))?/ix)
 			if result
 				return {
 					'platform' => platform ? platform : nil,
@@ -66,7 +66,7 @@ class Useragentparser
 			return empty
 		end
 
-		rv_result = userAgent.match(/rv:(?<version>[0-9A-Z.]+)/i)
+		rv_result = userAgent.match(/rv:(?<version>[\dA-Z.]+)/i)
 		if rv_result && rv_result['version']
 			rv_result = rv_result['version']
 		end
@@ -80,16 +80,16 @@ 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', 'XiaoMi/MiuiBrowser' => 'MiuiBrowser'}, refkey, refbro)
+		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)
 			browser = refbro[0]
-			version = result['version'][refkey[0]][0] =~ /[0-9]/ ? result['version'][refkey[0]] : nil
+			version = result['version'][refkey[0]][0] =~ /\d/ ? result['version'][refkey[0]] : nil
 		elsif find(lowerBrowser, 'Playstation Vita', refkey, platform)
 			platform = 'PlayStation Vita'
 			browser  = 'Browser'
 		elsif find(lowerBrowser, ['Kindle Fire', 'Silk'], refkey, refval)
 			browser  = refval[0] == 'Silk' ? 'Silk' : 'Kindle'
 			platform = 'Kindle Fire'
-			if !(version = result['version'][refkey[0]]) || !(version[0] =~ /[0-9]/ ? true : false)
+			if !(version = result['version'][refkey[0]]) || !(version[0] =~ /\d/ ? true : false)
 				version = result['version'][result['browser'].index('Version')]
 			end
 		elsif platform == 'Nintendo 3DS' || find(lowerBrowser, 'NintendoBrowser', refkey)

data/redmine_apijs.gemspec

@@ -1,9 +1,9 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name        = 'redmine_apijs'
-  s.version     = '6.8.2'
+  s.version     = '6.9.0'
   s.summary     = 'Redmine Apijs plugin'
-  s.description = 'Integrate the apijs JavaScript library into Redmine. Provides a gallery for image and video attachments.'
+  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'
   s.license     = 'GPL-2.0-or-later'
   s.authors     = ['Fabrice Creuzot']
@@ -66,12 +66,10 @@ Gem::Specification.new do |s|
     Gemfile
     init.rb
     lib/apijs_attachment.rb
-    lib/apijs_const.rb
     lib/apijs_files.rb
     lib/image.py
     lib/redmine_apijs.rb
     lib/useragentparser.rb
-    lib/video.py
     LICENSE
     README
     redmine_apijs.gemspec

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: redmine_apijs
 version: !ruby/object:Gem::Version
-  version: 6.8.2
+  version: 6.9.0
 platform: ruby
 authors:
 - Fabrice Creuzot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-01 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Integrate the apijs JavaScript library into Redmine. Provides a gallery
-  for image and video attachments.
+  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
 email: code@luigifab.fr
 executables: []
 extensions: []
@@ -70,12 +71,10 @@ files:
 - config/routes.rb
 - init.rb
 - lib/apijs_attachment.rb
-- lib/apijs_const.rb
 - lib/apijs_files.rb
 - lib/image.py
 - lib/redmine_apijs.rb
 - lib/useragentparser.rb
-- lib/video.py
 - redmine_apijs.gemspec
 homepage: https://github.com/luigifab/redmine-apijs
 licenses:
@@ -99,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.3.15
 signing_key: 
 specification_version: 4
 summary: Redmine Apijs plugin

data/lib/apijs_const.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-# Created L/01/09/2014
-# Updated J/23/07/2020
-#
-# Copyright 2008-2022 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
-# https://www.luigifab.fr/redmine/apijs
-#
-# This program is free software, you can redistribute it or modify
-# it under the terms of the GNU General Public License (GPL) as published
-# by the free software foundation, either version 2 of the license, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but without any warranty, without even the implied warranty of
-# merchantability or fitness for a particular purpose. See the
-# GNU General Public License (GPL) for more details.
-
-if Redmine::VERSION::MAJOR >= 3
-	if defined? Redmine.root
-		ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(Redmine.root, 'files')
-		APIJS_ROOT = File.join(Redmine.root, 'tmp', 'apijs')
-	else
-		ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, 'files')
-		APIJS_ROOT = File.join(Rails.root, 'tmp', 'apijs')
-	end
-elsif ENV['RAILS_TMP']
-	ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(ENV['RAILS_VAR'], 'files')
-	APIJS_ROOT = File.join(ENV['RAILS_TMP'], 'tmp', 'apijs')
-elsif ENV['RAILS_CACHE']
-	ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(ENV['RAILS_VAR'], 'files')
-	APIJS_ROOT = File.join(ENV['RAILS_CACHE'], 'tmp', 'apijs')
-else
-	ALL_FILES  = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, 'files')
-	APIJS_ROOT = File.join(Rails.root, 'tmp', 'apijs')
-end