redmineup 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc6eee33542600145eba2fd7789b0b4166fc992752e1ae73123d2b92a290588
-  data.tar.gz: 2f1bb7682cea36f0bab2481fe3e13f67e54736bd0751442d4e90652144a73589
+  metadata.gz: 8307975a84d27f5d5cc4e0e3b9914452f58b0a8bf643ed81ace81625269649f3
+  data.tar.gz: b75a2850b6d750245ba5f41ecd4d240a4f866b993e248a26294d9830fd9fc528
 SHA512:
-  metadata.gz: 398413f2a14e103ab19db992c186d142fe7acfb31a9c90a26b56880cfa084662250dd807d362a533ede13fd2f0df00813eeefb05c9f1869a37e74158da2d4eb3
-  data.tar.gz: b344e60e5a6dc5f551da6cd17fa2a055445a3a1dbac62647a8677a07e1c06c092fe10fcce12c8e944ffb6b3b2136bac9c25a5c6416c1289af84de514d5e05afb
+  metadata.gz: f82be9dbdcde0ef65869643b9054ac4a88097f4f211c9451f42bc342509be0d0eb4f2962b7977fe93114b2492c5ce66688407aa6a8599ffca8f6b7949320b57e
+  data.tar.gz: 75ce82b8fcebbb10ec7af953e51974720f1ff2d4f398796c7a3dd35f48ec8f5470a1c8447ecf14ca7f24b13339fd016f4f2ad6e639e059b772a3f35c3e88425a

data/.gitlab-ci.yml

@@ -1,7 +1,7 @@
 default:
   services:
-    - mysql:5.7
-    - postgres:11
+    - mysql:8
+    - postgres:15
 
 variables:
   MYSQL_DATABASE: redmineup_test
@@ -13,30 +13,20 @@ workflow:
   rules:
     - if: $CI_PIPELINE_SOURCE != "merge_request_event"
 
-ruby-2.4.1:
+ruby-3.1.7:
   stage: test
-  image: ruby:2.4.1
+  image: ruby:3.1.7-bookworm
   script:
-    - sed -i "s/'sqlite3'/'sqlite3', '~> 1.3.6'/g" redmineup.gemspec
-    - sed -i "s/'mysql2'/'mysql2', '~> 0.4.0'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'loofah', '~>2.19.1'/g" redmineup.gemspec
     - bundle install
     - bundle exec rake test DB=sqlite
     - bundle exec rake test DB=postgresql
     - bundle exec rake test DB=mysql
 
-ruby-3.4.4:
+ruby-4.0.2:
   stage: test
-  image: ruby:3.4.4-bookworm
+  image: ruby:4.0.2-bookworm
   script:
-    - sed -i "s/'sqlite3'/'sqlite3', '~> 1.4.4'/g" redmineup.gemspec
-    - sed -i "s/'mysql2'/'mysql2', '~> 0.5.0'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'loofah', '~>2.19.1'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'concurrent-ruby', '1.3.4'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'bigdecimal', '3.1.8'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'mutex_m'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'drb'/g" redmineup.gemspec
-    - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'minitest', '< 6'/g" redmineup.gemspec
+    - sed -i "s/spec.add_development_dependency 'pg'/spec.add_development_dependency 'pg'\n  spec.add_development_dependency 'minitest-mock'/g" redmineup.gemspec
     - bundle install
     - bundle exec rake test DB=sqlite
     - bundle exec rake test DB=postgresql

data/app/assets/javascripts/select2_helpers.js

@@ -123,6 +123,7 @@ function select2Tag(id, options) {
   $(function () {
     var selectField = $('select#' + id);
     selectField.select2(buildSelect2Options(options));
+    bindSelectHandler(selectField, options);
 
     var select2Instance = selectField.data('select2');
     select2Instance.on('results:message', function(params){
@@ -133,6 +134,15 @@ function select2Tag(id, options) {
 };
 
 
+function bindSelectHandler(selectField, options) {
+  var callbackName = options['on_select'];
+  if (!callbackName) { return; }
+  if (typeof window[callbackName] !== 'function') { return; }
+
+  selectField.on('select2:select', window[callbackName]);
+}
+
+
 function buildSelect2Options(options) {
   result = {
     placeholder: options['placeholder'] || '',

data/doc/CHANGELOG

@@ -4,6 +4,16 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-05-01 v1.1.8
+
+* Added `on_select` callback and `select_icon` options for `select2tag` helper
+* Updated `requires_redmineup` version guard to reduce boilerplate in plugin init
+* Fixed `link_to` display compatibility issue in Redmine 5
+
+== 2026-04-18 v1.1.7
+
+* hot fix for atom/rss compatibility for redmine < 5
+
 == 2026-04-17 v1.1.6
 
 * Added helpers for timezone conversions

data/lib/redmineup/helpers/form_tag_helper.rb

@@ -18,6 +18,7 @@ module Redmineup
     # * <tt>:allow_clear</tt> Provides support for clearable selections. Default value false.
     # * <tt>:min_input_length</tt> Minimum number of characters required to start a search. Default value 0.
     # * <tt>:format_state</tt> Defines template of search results in the drop-down.
+    # * <tt>:on_select</tt> Global JS callback name bound to `select2:select` event.
     # * <tt>:tags</tt> Used to enable tagging feature.
     #
     # <b>Note:</b> The HTML specification says when +multiple+ parameter passed to select and all options got deselected

data/lib/redmineup/patches/compatibility/sprite_patch.rb

@@ -4,7 +4,7 @@ module Redmineup
       module SpritePatch
         def self.included(base)
           base.class_eval do
-            def sprite_icon(icon_name, label = nil, icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil, rtl: false)
+            def sprite_icon(icon_name, label = '', icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil, rtl: false)
               label
             end
           end

data/lib/redmineup/patches/compatibility/user_patch.rb

@@ -16,6 +16,6 @@ module Redmineup
   end
 end
 
-unless ActionDispatch::Routing::Mapper.included_modules.include?(Redmineup::Patches::Compatibility::UserPatch)
-  ActionDispatch::Routing::Mapper.send(:include, Redmineup::Patches::Compatibility::UserPatch)
-end
+unless User.included_modules.include?(Redmineup::Patches::Compatibility::UserPatch)
+  User.send(:include, Redmineup::Patches::Compatibility::UserPatch)
+end

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.1.6'
+  VERSION = '1.1.8'
 end

data/lib/redmineup.rb

@@ -111,44 +111,22 @@ if defined?(ActionView::Base)
 end
 
 def requires_redmineup(arg)
-  def compare_versions(requirement, current)
-    raise ArgumentError.new('wrong version format') unless check_version_format(requirement)
-
-    requirement = requirement.split('.').collect(&:to_i)
-    requirement <=> current.slice(0, requirement.size)
-  end
+  arg = { version_or_higher: arg } unless arg.is_a?(Hash)
+  arg.assert_valid_keys(:version_or_higher)
 
-  def check_version_format(version)
-    version =~ /^\d+.?\d*.?\d*$/m
+  requirement = arg[:version_or_higher]
+  unless requirement.is_a?(String)
+    raise ArgumentError, ':version_or_higher accepts a version string only'
   end
 
-  arg = { version_or_higher: arg } unless arg.is_a?(Hash)
-  arg.assert_valid_keys(:version, :version_or_higher)
+  current = Gem::Version.new(Redmineup::VERSION)
+  required = Gem::Version.new(requirement)
 
-  current = Redmineup::VERSION.split('.').map { |x| x.to_i }
-  arg.each do |k, req|
-    case k
-    when :version_or_higher
-      raise ArgumentError.new(':version_or_higher accepts a version string only') unless req.is_a?(String)
+  return true if required <= current
 
-      unless compare_versions(req, current) <= 0
-        Rails.logger.error "\033[31m[ERROR]\033[0m Redmine requires redmineup gem version #{req} or higher (you're using #{Redmineup::VERSION}).\n\033[31m[ERROR]\033[0m Please update with 'bundle update redmineup'." if Rails.logger
-        abort "\033[31mRedmine requires redmineup gem version #{req} or higher (you're using #{Redmineup::VERSION}).\nPlease update with 'bundle update redmineup'.\033[0m"
-      end
-    when :version
-      req = [req] if req.is_a?(String)
-      if req.is_a?(Array)
-        unless req.detect { |ver| compare_versions(ver, current) == 0 }
-          abort "\033[31mRedmine requires redmineup gem version #{req} (you're using #{Redmineup::VERSION}).\nPlease update with 'bundle update redmineup'.\033[0m"
-        end
-      elsif req.is_a?(Range)
-        unless compare_versions(req.first, current) <= 0 && compare_versions(req.last, current) >= 0
-          abort "\033[31mRedmine requires redmineup gem version between #{req.first} and #{req.last} (you're using #{Redmineup::VERSION}).\nPlease update with 'bundle update redmineup'.\033[0m"
-        end
-      else
-        raise ArgumentError.new(':version option accepts a version string, an array or a range of versions')
-      end
-    end
-  end
-  true
+  message = "Redmine requires redmineup gem version #{requirement} or higher " \
+            "(you're using #{Redmineup::VERSION}).\n" \
+            "Please update with 'bundle update redmineup --conservative'."
+  Rails.logger&.error("\033[31m[ERROR]\033[0m #{message}")
+  abort "\033[31m#{message}\033[0m"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-17 00:00:00.000000000 Z
+date: 2026-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails