redmineup 1.1.3 → 1.1.11

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
@@ -49,6 +50,31 @@ module Redmineup
 
     alias select2 select2_tag
 
+    # Renders a select2 tag field for a tag list (standalone, no form object).
+    # Analogous to text_field_tag.
+    #
+    # ==== Example
+    #   tag_list_field_tag 'entry[tag_list]', entry.tag_list,
+    #     url: auto_complete_taggable_tags_path(taggable_type: 'DriveEntry')
+    def tag_list_field_tag(name, value = [], options = {})
+      url = options.delete(:url)
+      taggable_type = options.delete(:taggable_type)
+      width = options.delete(:width)
+      project_id = options.delete(:project_id)
+      placeholder = options.delete(:placeholder)
+      select2_tag(
+        name,
+        options_for_select(value, value),
+        {
+          multiple:    true,
+          width:       width || '95%',
+          url:         url || auto_complete_taggable_tags_path(taggable_type: taggable_type, project_id: project_id),
+          placeholder: placeholder || l(:lable_redmineup_add_tag),
+          tags:        true
+        }.merge(options)
+      )
+    end
+
     # Transforms select filters of +type+ fields into select2
     #
     # ==== Examples
@@ -86,3 +112,20 @@ module Redmineup
 
   end
 end
+
+# Extends Rails FormBuilder with tag_list_field, analogous to f.text_field.
+#
+# ==== Example
+#   <%= f.tag_list_field :tag_list %>
+ActionView::Helpers::FormBuilder.class_eval do
+  def tag_list_field(method, **options)
+    url = options.fetch(:url) {
+      @template.auto_complete_taggable_tags_path(taggable_type: @object.class.name)
+    }
+    @template.tag_list_field_tag(
+      "#{@object_name}[#{method}]",
+      @object.public_send(method),
+      {url: url}.merge(options.except(:url))
+    )
+  end
+end

data/lib/redmineup/helpers/tags_helper.rb

@@ -9,5 +9,46 @@ module Redmineup
         yield tag, classes[index]
       end
     end
+
+    def tag_link(url, tag_name, options = {})
+      count      = options.delete(:count)
+      inner      = link_to(tag_name, url, options)
+      inner << content_tag('span', "(#{count})", class: 'tag-count') if count
+      css        = monochrome? ? 'tag-label' : 'tag-label-color'
+      style      = monochrome? ? {} : { style: "background-color: #{Redmineup::ActsAsTaggable::Tag.color_from_name(tag_name)}" }
+      content_tag(:span, inner, { class: css }.merge(style))
+    end
+
+    def tag_separator
+      monochrome? ? ', ' : ' '
+    end
+
+    def monochrome?
+      @monochrome ||= defined?(RedmineupTags) && !RedmineupTags.use_colors?
+    end
+
+    def tag_links(tag_list, options = {}, &url_block)
+      return if tag_list.blank?
+      content_tag(:span, class: 'tag_list') do
+        safe_join(tag_list.map { |tag| tag_link(url_block.call(tag), tag, options.dup) }, tag_separator)
+      end
+    end
+
+    # Renders span.tag_list from an array of tag objects (respond to .name and .count).
+    # Resolves URL via `{key}_tag_url(name)` in the current view context.
+    #
+    #   tag_cloud_links(contact.available_tags, :contact)   # → contact_tag_url(name)
+    #   tag_cloud_links(tags_cloud, :people)                # → people_tag_url(name)
+    def tag_cloud_links(tags, key, options = {})
+      return if tags.blank?
+      url_method = :"#{key}_tag_url"
+      raise NoMethodError, "#{url_method} is not defined in view context" unless respond_to?(url_method, true)
+      content_tag(:span, class: 'tag_list') do
+        safe_join(tags.map { |tag|
+          tag_link(send(url_method, tag.name), tag.name, options.merge(count: tag.count).dup)
+        }, tag_separator)
+      end
+    end
+
   end
 end

data/lib/redmineup/hooks/views_layouts_hook.rb

@@ -3,11 +3,7 @@
 module Redmineup
   module Hooks
     class ViewsLayoutsHook < Redmine::Hook::ViewListener
-      def view_layouts_base_html_head(_context = {})
-        stylesheet_link_tag(:calendars, plugin: 'redmineup') +
-        stylesheet_link_tag(:money, plugin: 'redmineup') +
-        javascript_include_tag(:consumer, plugin: 'redmineup')
-      end
+      render_on :view_layouts_base_html_head, partial: 'redmineup/additional_assets'
     end
   end
 end

data/lib/redmineup/money_helper.rb

@@ -8,11 +8,19 @@ module Redmineup
       price_to_currency(obj.try(price_field), obj.currency, options).to_s if obj.respond_to?(:currency)
     end
 
-    def prices_collection_by_currency(prices_collection, options = {})
+    def prices_formatted_collection(prices_collection, options = {})
       return [] if prices_collection.blank? || prices_collection == 0
       prices = prices_collection
       prices.reject!{|k, v| v.to_i == 0} if options[:hide_zeros]
-      prices.collect{|k, v| content_tag(:span, price_to_currency(v, k, :symbol => true), :style => "white-space: nowrap;")}.compact
+      prices.map { |k, v| price_to_currency(v, k, symbol: true) }.compact
+    end
+
+    def prices_collection_by_currency(prices_collection, options = {})
+      formatted_prices = prices_formatted_collection(prices_collection, options)
+
+      formatted_prices.map do |formatted_price|
+        content_tag(:span, formatted_price, :style => "white-space: nowrap;")
+      end
     end
 
     def deal_currency_icon(currency)

data/lib/redmineup/patches/action_cable_base_patch.rb

@@ -7,8 +7,15 @@ module Redmineup
       end
 
       module ClassMethods
-        def rup_broadcast_to(klass, model, message)
-          ActionCable.rup_server(klass).broadcast(broadcasting_for(model), message)
+        def rup_broadcast_to(*args)
+          # TODO: Remove to 2 args after plugins update
+          if args.length == 3
+            klass, model, message = args
+            ActionCable.rup_server(klass).broadcast(broadcasting_for(model), message)
+          else
+            model, message = args
+            ActionCable.rup_server.broadcast(broadcasting_for(model), message)
+          end
         end
       end
     end

data/lib/redmineup/patches/action_cable_patch.rb

@@ -1,10 +1,9 @@
 module Redmineup
   module Patches
     module ActionCablePatch
-
       def self.included(base)
         base.class_eval do
-          module_function def rup_server(klass = nil)
+          module_function def rup_server(klass = 'ActionCable::Connection::RupConnection')
             @rup_servers ||= {}
             return @rup_servers[klass] if @rup_servers[klass]
 
@@ -14,10 +13,9 @@ module Redmineup
         end
       end
     end
-
   end
 end
 
 unless ActionCable.included_modules.include?(Redmineup::Patches::ActionCablePatch)
-  ActionCable.send(:include, Redmineup::Patches::ActionCablePatch)
+  ActionCable.include Redmineup::Patches::ActionCablePatch
 end

data/lib/redmineup/patches/auto_completes_controller_patch.rb

@@ -0,0 +1,19 @@
+module Redmineup
+  module Patches
+    module AutoCompletesControllerPatch
+      DEFAULT_TAGS_LIMIT = 10
+
+      def taggable_tags
+        limit = params.delete(:limit) || DEFAULT_TAGS_LIMIT
+        klass = Object.const_get(params[:taggable_type].camelcase) if params[:taggable_type].present?
+
+        tags = klass && klass.available_tags(params.merge(limit: limit, name_like: params[:q])) || Redmineup::ActsAsTaggable::Tag.limit(limit)
+        render json: tags.map { |tag| { id: tag.name, text: tag.name } }
+      end
+    end
+  end
+end
+
+unless AutoCompletesController.included_modules.include?(Redmineup::Patches::AutoCompletesControllerPatch)
+  AutoCompletesController.include(Redmineup::Patches::AutoCompletesControllerPatch)
+end

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.3'
+  VERSION = '1.1.11'
 end

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'
@@ -65,6 +66,7 @@ require 'application_record' if !defined?(ApplicationRecord) && Rails.version <
 if Redmineup.cable_available?
   require 'action_cable/server/rup_configuration'
   require 'action_cable/server/rup_server'
+  require 'action_cable/connection/rup_connection'
   require 'redmineup/patches/action_cable_base_patch'
   require 'redmineup/patches/action_cable_patch'
 end
@@ -106,47 +108,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/schema.rb

@@ -150,7 +150,7 @@ ActiveRecord::Schema.define version: 0 do
     t.column :viewer_id,   :integer
     t.column :viewed_id,   :integer
     t.column :viewed_type, :string
-    t.column :ip, :string, limit: '24'
+    t.column :ip, :string, limit: '45'
     t.column :created_at, :datetime
   end
 end

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.11
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-10 00:00:00.000000000 Z
+date: 2026-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,12 +119,16 @@ files:
 - app/assets/javascripts/Chart.bundle.min.js.bak
 - app/assets/javascripts/chart.min.js
 - app/assets/javascripts/consumer.js
+- app/assets/javascripts/consumer_worker.js
+- app/assets/javascripts/jquery.colorPicker.min.js
 - app/assets/javascripts/select2.js
 - 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 +140,10 @@ 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/connection/rup_connection.rb
 - lib/action_cable/server/rup_configuration.rb
 - lib/action_cable/server/rup_server.rb
 - lib/application_record.rb
@@ -162,6 +170,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 +192,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 +248,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 +320,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