redmineup 1.1.3 → 1.1.8

data/lib/redmineup.rb

@@ -44,6 +44,7 @@ require 'redmineup/liquid/drops/custom_field_enumeration_drop'
 require 'redmineup/helpers/external_assets_helper'
 require 'redmineup/helpers/form_tag_helper'
 require 'redmineup/helpers/calendars_helper'
+require 'redmineup/helpers/datetime_helper'
 require 'redmineup/assets_manager'
 
 require 'redmineup/patches/liquid_patch'
@@ -106,47 +107,26 @@ if defined?(ActionView::Base)
   ActionView::Base.send :include, Redmineup::CalendarsHelper
   ActionView::Base.send :include, Redmineup::ExternalAssetsHelper
   ActionView::Base.send :include, Redmineup::FormTagHelper
+  ActionView::Base.send :include, Redmineup::TagsHelper
 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

data/test/acts_as_taggable/tag_test.rb

@@ -34,16 +34,19 @@ class TagTest < ActiveSupport::TestCase
   end
 
   def test_color
-    colors = %w(#aaaaaa #bbbbbb)
-    colorized = [tags(:bug), tags(:feature)]
-    colorized.each do |tag|
-      assert_equal colors.include?(tag.color), true
-    end
+    assert_equal '#aaaaaa', tags(:feature).color # 11184810 = 0xaaaaaa
+    assert_equal '#bbbbbb', tags(:bug).color     # 12303291 = 0xbbbbbb
+    # no DB color — falls back to color_from_name, not nil
+    assert_equal Redmineup::ActsAsTaggable::Tag.color_from_name('error'), tags(:error).color
+    assert_equal Redmineup::ActsAsTaggable::Tag.color_from_name('question'), tags(:question).color
+  end
 
-    not_colorized = [tags(:error), tags(:question)]
-    not_colorized.each do |tag|
-      assert_nil tag.color
-    end
+  def test_color_from_name
+    color = Redmineup::ActsAsTaggable::Tag.color_from_name('error')
+    assert_match(/\A#[0-9a-f]{6}\z/, color)
+    assert_equal color, Redmineup::ActsAsTaggable::Tag.color_from_name('error') # deterministic
+    assert_not_equal color, Redmineup::ActsAsTaggable::Tag.color_from_name('other')
+    assert_match(/\A#[0-9a-f]{6}\z/, Redmineup::ActsAsTaggable::Tag.color_from_name(nil))
   end
 
   def test_tag_is_equal_to_itself

data/test/tags_helper_view_test.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class TagsHelperViewTest < ActionView::TestCase
+  include Redmineup::TagsHelper
+  include Redmineup::FormTagHelper
+
+  def stub_tag_url(name) 
+    "/stub_tags/#{name}" # URL stub for tag_cloud_links(tags, :stub)
+  end
+
+  def test_tag_link
+    result = tag_link('/tags/error', 'error', count: 3)
+    assert_includes result, 'tag-label-color'
+    assert_includes result, 'background-color: #'
+    assert_includes result, '(3)'
+  end
+
+  def test_tag_links
+    result = tag_links(['error', 'bug']) { |t| "/tags/#{t}" }
+    assert_includes result, 'class="tag_list"'
+    assert_nil tag_links([]) { |t| "/tags/#{t}" }
+  end
+
+  def test_tag_cloud_links
+    result = tag_cloud_links(Issue.tag_counts, :stub)
+    assert_includes result, 'class="tag_list"'
+    assert_includes result, '/stub_tags/'
+    assert_nil tag_cloud_links([], :stub)
+    assert_raises(NoMethodError) { tag_cloud_links(Issue.tag_counts, :unknown_xyz) }
+  end
+
+  def test_tag_list_field_tag
+    result = tag_list_field_tag('issue[tag_list]', ['bug'],
+                                url: '/auto_completes/taggable_tags',
+                                width: '60%', tags: false,
+                                placeholder: '+ add tag')
+    assert_includes result, 'name="issue[tag_list][]"'
+    assert_includes result, '"width":"60%"'
+    assert_includes result, '"tags":false'
+  end
+end

data/test/test_helper.rb

@@ -13,7 +13,8 @@ Dir.glob(File.expand_path('models/*.rb', __dir__)).each { |f| require f }
 class ActiveSupport::TestCase # :nodoc:
   include ActiveRecord::TestFixtures
 
-  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
+  gem_fixtures_path = File.dirname(__FILE__) + '/fixtures/'
+  respond_to?(:fixture_paths=) ? self.fixture_paths = [gem_fixtures_path] : self.fixture_path = gem_fixtures_path 
 
   self.use_transactional_tests = true if RUBY_VERSION > '1.9.3'
   self.use_instantiated_fixtures = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-10 00:00:00.000000000 Z
+date: 2026-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,8 +123,10 @@ files:
 - app/assets/javascripts/select2_helpers.js
 - app/assets/stylesheets/calendars.css
 - app/assets/stylesheets/money.css
+- app/assets/stylesheets/redmineup.css
 - app/assets/stylesheets/select2.css
 - app/controllers/redmineup_controller.rb
+- app/views/redmineup/_additional_assets.html.erb
 - app/views/redmineup/_money.html.erb
 - app/views/redmineup/settings.html.erb
 - config/currency_iso.json
@@ -136,6 +138,9 @@ files:
 - config/routes.rb
 - doc/CHANGELOG
 - doc/LICENSE.txt
+- doc/active-record-mixins.md
+- doc/assets-money-and-utilities.md
+- doc/tagging-and-select2.md
 - lib/action_cable/server/rup_configuration.rb
 - lib/action_cable/server/rup_server.rb
 - lib/application_record.rb
@@ -162,6 +167,7 @@ files:
 - lib/redmineup/currency/loader.rb
 - lib/redmineup/engine.rb
 - lib/redmineup/helpers/calendars_helper.rb
+- lib/redmineup/helpers/datetime_helper.rb
 - lib/redmineup/helpers/external_assets_helper.rb
 - lib/redmineup/helpers/form_tag_helper.rb
 - lib/redmineup/helpers/tags_helper.rb
@@ -183,6 +189,7 @@ files:
 - lib/redmineup/money_helper.rb
 - lib/redmineup/patches/action_cable_base_patch.rb
 - lib/redmineup/patches/action_cable_patch.rb
+- lib/redmineup/patches/auto_completes_controller_patch.rb
 - lib/redmineup/patches/compatibility/application_controller_patch.rb
 - lib/redmineup/patches/compatibility/routing_mapper_patch.rb
 - lib/redmineup/patches/compatibility/sprite_patch.rb
@@ -238,6 +245,7 @@ files:
 - test/money_helper_test.rb
 - test/schema.rb
 - test/tags_helper_test.rb
+- test/tags_helper_view_test.rb
 - test/test_helper.rb
 - test/vote_helper_test.rb
 homepage: https://www.redmineup.com
@@ -309,5 +317,6 @@ test_files:
 - test/money_helper_test.rb
 - test/schema.rb
 - test/tags_helper_test.rb
+- test/tags_helper_view_test.rb
 - test/test_helper.rb
 - test/vote_helper_test.rb