redmineup 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fcf43fcb4e8ea71cdf32906bcceb05b8067aa7fb2da33d8df7d72e7775ffd74
-  data.tar.gz: 436a088ae472041d086ec6ae0c896858a9f84d168b5a999bdc541e183b3d4b07
+  metadata.gz: e16d0fd8b57ea9d77f2c2b769ee99e3f00adb3de950f2b856d206d6db9d7f66d
+  data.tar.gz: ae312cd72499e910065b8661485cb483e8798b6ed26887e18cf54660a3a8c03d
 SHA512:
-  metadata.gz: bdda671371d9f8163d9eb0d346b2b71549351f7534ab4e5db080e2317ae46c5be5408ecc0386e9a3dfbb66340d6167513118cbea3f48ce91956b362f8cadc3c6
-  data.tar.gz: 185c02c2ed3924b13dc93e00c11bf8e90080fe3be00a88729aa278f573cc1c3f60725fddbdcbc90d25fb0a4408838e9ffc04dfb158b112070ab5f7b016ab899e
+  metadata.gz: d273c6a8db3effbdce540bdd545576020f0f57083ba686739618894d6b8599951b7bf27ecdcd6677110d1db32f761148ad0f87b83c88a996bae3ff51a5036887
+  data.tar.gz: 61df5ba9902c47fd6c1257b018c6513ac393f51d2b75095c27e5f5b6dc04bf927d6fdaca8666189262f0580afb0b0f9ec76d75d81a9e24e47bbadc4c75d23729

data/.gitlab-ci.yml

@@ -27,9 +27,7 @@ ruby-2.4.1:
 
 ruby-3.4.4:
   stage: test
-  tags:
-    - local
-  image: ruby:3.4.4
+  image: ruby:3.4.4-bookworm
   script:
     - sed -i "s/'sqlite3'/'sqlite3', '~> 1.4.4'/g" redmineup.gemspec
     - sed -i "s/'mysql2'/'mysql2', '~> 0.5.0'/g" redmineup.gemspec
@@ -38,6 +36,7 @@ ruby-3.4.4:
     - 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
     - bundle install
     - bundle exec rake test DB=sqlite
     - bundle exec rake test DB=postgresql

data/app/assets/javascripts/consumer.js

@@ -24,6 +24,16 @@ class activeCableConsumer {
     this.consumer.process(message);
   }
 
+  send(data) {
+    if (this.isOpen()) {
+      this.socket.send(JSON.stringify(data));
+      return true;
+    } else {
+      console.warn("WebSocket is not open");
+      return false;
+    }
+  }
+
   isOpen() {
     return this.socket.readyState === this.OPEN;
   }

data/doc/CHANGELOG

@@ -1,9 +1,18 @@
 == RedmineUP gem changelog
 
 Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2025 Kirill Bezrukov (RedmineUP)
+Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-04-10 v1.1.4
+
+* Fixed tags queries for MSSQL adapter
+
+== 2026-03-10 v1.1.3
+
+* Fixed ActionCable compatibility 
+* Added send method for ActionCable
+
 == 2025-11-07 v1.1.2
 
 * Fixed assets loading error

data/lib/action_cable/server/rup_configuration.rb

@@ -1,8 +1,6 @@
-
 module ActionCable
   module Server
     class RupConfiguration < ActionCable::Server::Configuration
-
       def initialize(connection_klass: 'ActionCable::Connection::Base')
         super()
 
@@ -12,13 +10,7 @@ module ActionCable
       end
 
       def cable
-        @cable ||= { 'adapter' => detect_adapter_type }.with_indifferent_access
-      end
-
-      private
-
-      def detect_adapter_type
-        ActionCable.server.config.cable ? (ActionCable.server.config.cable.fetch('adapter') { 'async' }) : 'async'
+        @cable ||= ActionCable.server.config.cable || { 'adapter' => 'async' }.with_indifferent_access
       end
     end
   end

data/lib/redmineup/acts_as_taggable/tag.rb

@@ -74,7 +74,7 @@ module Redmineup
           having    = 'COUNT(*) > 0'
           having    = [having, at_least, at_most].compact.join(' AND ')
           group_by  = "#{Tag.table_name}.id, #{Tag.table_name}.name"
-          # group_by << " AND #{having}" unless having.blank?
+          group_by << ", #{Tag.table_name}.color" if column_names.include?('color')
 
           select_condition = if self.column_names.include?('color')
             "#{Tag.table_name}.id, #{Tag.table_name}.name, #{Tag.table_name}.color, COUNT(*) AS count"

data/lib/redmineup/acts_as_taggable/up_acts_as_taggable.rb

@@ -147,6 +147,7 @@ module Redmineup
           group_fields = ''
           group_fields << ", #{Tag.table_name}.created_at" if Tag.respond_to?(:created_at)
           group_fields << ", #{Tag.table_name}.updated_at" if Tag.respond_to?(:updated_at)
+          group_fields << ", #{Tag.table_name}.color" if Tag.column_names.include?('color')
 
           if base_class.respond_to?(:visible_condition)
             visible_condition = base_class.visible_condition(User.current)

data/lib/redmineup/helpers/tags_helper.rb

@@ -9,5 +9,10 @@ module Redmineup
         yield tag, classes[index]
       end
     end
+
+    def tag_color(tag_name)
+      "##{'%06x' % (tag_name.unpack('H*').first.hex % 0xffffff)}"
+    end    
+
   end
 end

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 end

data/lib/redmineup.rb

@@ -106,6 +106,7 @@ 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)

data/test/test_helper.rb

@@ -1,25 +1,26 @@
 require 'rails/all'
 require 'redmineup'
 require 'minitest/autorun'
+require 'minitest/mock'
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')
 ActiveRecord::Base.configurations = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 ActiveRecord::Base.establish_connection(ENV['DB'].try(:to_sym) || :sqlite)
 
 load(File.dirname(__FILE__) + '/schema.rb')
-Dir.glob(File.expand_path('../models/*.rb', __FILE__)).each { |f| require f }
+Dir.glob(File.expand_path('models/*.rb', __dir__)).each { |f| require f }
 
-class ActiveSupport::TestCase #:nodoc:
+class ActiveSupport::TestCase # :nodoc:
   include ActiveRecord::TestFixtures
 
   self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
 
   self.use_transactional_tests = true if RUBY_VERSION > '1.9.3'
   self.use_instantiated_fixtures = false
-  set_fixture_class :tags => Redmineup::ActsAsTaggable::Tag
-  set_fixture_class :taggings => Redmineup::ActsAsTaggable::Tagging
+  set_fixture_class tags: Redmineup::ActsAsTaggable::Tag
+  set_fixture_class taggings: Redmineup::ActsAsTaggable::Tagging
 
-  set_fixture_class :votable_caches => VotableCache
+  set_fixture_class votable_caches: VotableCache
   fixtures :all
 
   def assert_equivalent(expected, actual, message = nil)
@@ -32,9 +33,8 @@ class ActiveSupport::TestCase #:nodoc:
 
   def assert_tag_counts(tags, expected_values)
     # Map the tag fixture names to real tag names
-    expected_values = expected_values.inject({}) do |hash, (tag, count)|
+    expected_values = expected_values.each_with_object({}) do |(tag, count), hash|
       hash[tags(tag).name] = count
-      hash
     end
 
     tags.each do |tag|
@@ -44,14 +44,14 @@ class ActiveSupport::TestCase #:nodoc:
       assert_equal value, tag.count, "Expected value of #{value} for #{tag.name}, but was #{tag.count}"
     end
 
-    unless expected_values.empty?
-      assert false, "The following tag counts were not present: #{expected_values.inspect}"
-    end
+    return if expected_values.empty?
+
+    assert false, "The following tag counts were not present: #{expected_values.inspect}"
   end
 
   # From Rails trunk
   def assert_difference(expressions, difference = 1, message = nil, &block)
-    expression_evaluations = [expressions].flatten.collect{ |expression| lambda { eval(expression, block.binding) } }
+    expression_evaluations = [expressions].flatten.collect { |expression| -> { eval(expression, block.binding) } }
 
     original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression.call }
     yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-07 00:00:00.000000000 Z
+date: 2026-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails