redmineup 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b24f399a84ad8b507bc4bd261e4b239fd230d95df88b6144475e991774846d
-  data.tar.gz: 8b7e6f842158fb6940443adb06f83b5314ecef5507acc9a1f4741aaf3c40b1ec
+  metadata.gz: 1d9641fde0d380147805eb9c4a091b952e944d8fe20b7b3ca50e49a0a30b3caa
+  data.tar.gz: 62481de6881b314734528adc59139a120b3abc2dc86298ffcd6c1ee8a0d1c69d
 SHA512:
-  metadata.gz: f34aff4d6d617d695e0ef78697a410b8b09a8bcbdc44d5a1e6fb3dfbdfc6577cbb99eaad438cbd25124b41b10e151af0d3cb9d78fb8f9cb7a757cd1a1aef307c
-  data.tar.gz: a53558cb49f37db3377b33e1bd66689561f6df8a4d9529118dc2a2d523ff1b20270808d411b81cbdbf95283b14e91c90ee3d06f923440a2f1de0b444bd131fd0
+  metadata.gz: '0790f736703855ee89e2755bd4e314f71d2c49da6a2294b5f777e0e14175d624502ac260bcf4e8f50b4c29b491b2bbf39aed0e3c64d0807b5b780e9dca394c0d'
+  data.tar.gz: 7e96ce727a5557d41275e0d6b16b0047d7e3d922eb3557fed5c653a54b2ea4925eff773eafa5b1cd81fedce2408afb007e8508d359285b4a9d46d11fb0d40d78

data/.gitlab-ci.yml

@@ -0,0 +1,44 @@
+default:
+  services:
+    - mysql:5.7
+    - postgres:11
+
+variables:
+  MYSQL_DATABASE: redmineup_test
+  MYSQL_ROOT_PASSWORD: password
+  POSTGRES_DB: redmineup_test
+  POSTGRES_PASSWORD: password
+
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "merge_request_event"
+
+ruby-2.4.1:
+  stage: test
+  image: ruby:2.4.1
+  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:
+  stage: test
+  tags:
+    - local
+  image: ruby:3.4.4
+  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
+    - bundle install
+    - bundle exec rake test DB=sqlite
+    - bundle exec rake test DB=postgresql
+    - bundle exec rake test DB=mysql

data/app/assets/javascripts/consumer.js

@@ -0,0 +1,66 @@
+class activeCableConsumer {
+  OPEN = 1;
+
+  constructor(consumer) {
+    this.consumer = consumer;
+    this._isConnecting = true;
+
+    this.connect();
+  }
+
+  connect() {
+    this.socket = this.intializeSocket(this, this.consumer);
+    this._isConnecting = false;
+  }
+
+  reconnect() {
+    if (!this._isConnecting) {
+      setTimeout(this.connect.bind(this), 3000);
+      this._isConnecting = true;
+    }
+  }
+
+  processMessage(message) {
+    this.consumer.process(message);
+  }
+
+  isOpen() {
+    return this.socket.readyState === this.OPEN;
+  }
+
+  intializeSocket(self, consumer) {
+    const socket = new WebSocket(consumer.url);
+
+    socket.onopen = function () {
+      const message = {
+        command: "subscribe",
+        identifier: JSON.stringify({
+          channel: consumer.channel,
+          chat_id: consumer.chatId,
+        }),
+      };
+      socket.send(JSON.stringify(message));
+    };
+
+    socket.onclose = function () {
+      self.reconnect();
+    };
+
+    socket.onmessage = function (event) {
+      const messageData = (event.data && JSON.parse(event.data)) || {};
+      if (messageData.type === "ping" || !messageData.message) {
+        return;
+      }
+      const message = messageData.message;
+
+      self.processMessage(message);
+    };
+
+    socket.onerror = function (error) {
+      console.log(error);
+      self.reconnect();
+    };
+
+    return socket;
+  }
+}

data/doc/CHANGELOG

@@ -4,6 +4,12 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2025 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2025-07-24 v1.1.0
+
+* Added ActionCable methods
+* Fixed Tags migration method
+* Fixed svg icons for context menu
+
 == 2025-07-09 v1.0.13
 
 * Added color to Tag

data/lib/action_cable/server/rup_configuration.rb

@@ -0,0 +1,25 @@
+
+module ActionCable
+  module Server
+    class RupConfiguration < ActionCable::Server::Configuration
+
+      def initialize(connection_klass: 'ActionCable::Connection::Base')
+        super()
+
+        @connection_class = -> { connection_klass.constantize }
+        @logger ||= ::Rails.logger
+        @disable_request_forgery_protection = true
+      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'
+      end
+    end
+  end
+end

data/lib/action_cable/server/rup_server.rb

@@ -0,0 +1,13 @@
+module ActionCable
+  module Server
+    class RupServer < ActionCable::Server::Base
+      attr_reader :config
+
+      def initialize(config: self.class.config)
+        @config = config
+        @mutex = Monitor.new
+        @remote_connections = @event_loop = @worker_pool = @pubsub = nil
+      end
+    end
+  end
+end

data/lib/redmineup/acts_as_taggable/up_acts_as_taggable.rb

@@ -87,6 +87,7 @@ module Redmineup
 
           raise ArgumentError, "Table `#{table_name}' not found" unless self.connection.table_exists?(table_name)
 
+          self.table_name = table_name
           unless self.connection.column_exists?(table_name, tag_column[:name])
             self.connection.add_column table_name, tag_column[:name], tag_column[:type], default: tag_column[:default]
             self.reset_column_information

data/lib/redmineup/hooks/views_layouts_hook.rb

@@ -5,7 +5,8 @@ module Redmineup
     class ViewsLayoutsHook < Redmine::Hook::ViewListener
       def view_layouts_base_html_head(_context = {})
         stylesheet_link_tag(:calendars, plugin: 'redmineup') +
-        stylesheet_link_tag(:money, plugin: 'redmineup')
+        stylesheet_link_tag(:money, plugin: 'redmineup') +
+        javascript_include_tag(:consumer, plugin: 'redmineup')
       end
     end
   end

data/lib/redmineup/liquid/drops/version_drop.rb

@@ -11,7 +11,6 @@ module Redmineup
                 :sharing,
                 :default_project_version,
                 :start_date,
-                :due_date,
                 :estimated_hours,
                 :spent_hours,
                 :closed?,
@@ -28,7 +27,6 @@ module Redmineup
                 :to_s_with_project,
                 :shared?,
                 :deletable?,
-                :default_project_version,
                 :to_s,
                 to: :@version
 

data/lib/redmineup/patches/action_cable_base_patch.rb

@@ -0,0 +1,20 @@
+module Redmineup
+  module Patches
+    module ActionCableBasePatch
+      def self.included(base)
+        base.send(:extend, ClassMethods)
+        delegate :rup_broadcast_to, to: :class
+      end
+
+      module ClassMethods
+        def rup_broadcast_to(klass, model, message)
+          ActionCable.rup_server(klass).broadcast(broadcasting_for(model), message)
+        end
+      end
+    end
+  end
+end
+
+unless ActionCable::Channel::Base.included_modules.include?(Redmineup::Patches::ActionCableBasePatch)
+  ActionCable::Channel::Base.send(:include, Redmineup::Patches::ActionCableBasePatch)
+end

data/lib/redmineup/patches/action_cable_patch.rb

@@ -0,0 +1,23 @@
+module Redmineup
+  module Patches
+    module ActionCablePatch
+
+      def self.included(base)
+        base.class_eval do
+          module_function def rup_server(klass = nil)
+            @rup_servers ||= {}
+            return @rup_servers[klass] if @rup_servers[klass]
+
+            config = ActionCable::Server::RupConfiguration.new(connection_klass: klass)
+            @rup_servers[klass] = ActionCable::Server::RupServer.new(config: config)
+          end
+        end
+      end
+    end
+
+  end
+end
+
+unless ActionCable.included_modules.include?(Redmineup::Patches::ActionCablePatch)
+  ActionCable.send(:include, Redmineup::Patches::ActionCablePatch)
+end

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

@@ -7,7 +7,7 @@ module Redmineup
         end
 
         module InstanceMethods
-          def sprite_icon(icon_name, label = nil, icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil)
+          def sprite_icon(icon_name, label = nil, icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil, rtl: false)
             label
           end
         end

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.0.13'
+  VERSION = '1.1.0'
 end

data/lib/redmineup.rb

@@ -54,10 +54,21 @@ module Redmineup
   def self.plugin_installed?(plugin_id)
     Rails.root.join("plugins/#{plugin_id}/init.rb").exist?
   end
+
+  def self.cable_available?
+    Rails.version > '4.0'
+  end
 end
 
 require 'application_record' if !defined?(ApplicationRecord) && Rails.version < '7.2.2'
 
+if Redmineup.cable_available?
+  require 'action_cable/server/rup_configuration'
+  require 'action_cable/server/rup_server'
+  require 'redmineup/patches/action_cable_base_patch'
+  require 'redmineup/patches/action_cable_patch'
+end
+
 if defined?(ActiveRecord::Base)
   ActiveRecord::Base.send :include, Redmineup::ActsAsList::List
   ActiveRecord::Base.extend(Redmineup::ActsAsVotable::Voter)

data/test/acts_as_votable/votable_test.rb

@@ -67,7 +67,7 @@ class VotableTest < ActiveSupport::TestCase
     assert_equal votable.find_votes_for(:vote_scope => 'rank').size, 1
   end
 
-  def test_two_votes_for_when_voting_on_two_diff_scopes
+  def test_two_votes_for_when_voting_on_two_diff_scopes_dup
     votable.vote_by(:voter => voters(:voter), :vote => 'yes', :vote_scope => 'weekly_rank')
     votable.vote_by(:voter => voters(:voter), :vote => 'yes', :vote_scope => 'monthly_rank')
     assert_equal votable.votes_for.size, 2
@@ -404,7 +404,7 @@ class VotableTest < ActiveSupport::TestCase
     assert_equal votable_cache.cached_scoped_test_votes_total, 1
   end
 
-  def test_update_cached_total_votes_for_when_a_vote_up_is_removed
+  def test_update_cached_total_votes_for_when_a_vote_up_is_removed_dup
     votable_cache.vote_by(:voter => voter, :vote => 'true', :vote_scope => "test")
     votable_cache.unvote(:voter => voter, :vote_scope => "test")
     assert_equal votable_cache.cached_scoped_test_votes_total, 0
@@ -440,44 +440,44 @@ class VotableTest < ActiveSupport::TestCase
     assert_equal votable_cache.cached_scoped_test_votes_score, 0
   end
 
-  def test_update_cached_up_votes_for_if_there_is_an_up_vote_column
+  def test_update_cached_up_votes_for_if_there_is_an_up_vote_column_dup
     votable_cache.cached_scoped_test_votes_up = 50
     votable_cache.vote_by(:voter => voter, :vote_scope => "test")
     votable_cache.vote_by(:voter => voter, :vote_scope => "test")
     assert_equal votable_cache.cached_scoped_test_votes_up, 1
   end
 
-  def test_update_cached_down_votes_for_if_there_is_a_down_vote_column
+  def test_update_cached_down_votes_for_if_there_is_a_down_vote_column_dup
     votable_cache.cached_scoped_test_votes_down = 50
     votable_cache.vote_by(:voter => voter, :vote => 'false', :vote_scope => "test")
     assert_equal votable_cache.cached_scoped_test_votes_down, 1
   end
 
-  def test_update_cached_up_votes_for_when_a_vote_up_is_removed
+  def test_update_cached_up_votes_for_when_a_vote_up_is_removed_dup
     votable_cache.vote_by :voter => voter, :vote => 'true', :vote_scope => "test"
     votable_cache.unvote :voter => voter, :vote_scope => "test"
     assert_equal votable_cache.cached_scoped_test_votes_up, 0
   end
 
-  def test_update_cached_down_votes_for_when_a_vote_down_is_removed
+  def test_update_cached_down_votes_for_when_a_vote_down_is_removed_dup
     votable_cache.vote_by(:voter => voter, :vote => 'false', :vote_scope => "test")
     votable_cache.unvote(:voter => voter, :vote_scope => "test")
     assert_equal votable_cache.cached_scoped_test_votes_down, 0
   end
 
-  def test_select_from_cached_total_votes_for_if_there_a_total_column
+  def test_select_from_cached_total_votes_for_if_there_a_total_column_dup
     votable_cache.vote_by(:voter => voter, :vote_scope => "test")
     votable_cache.cached_scoped_test_votes_total = 50
     assert_equal votable_cache.count_votes_total(false, "test"), 50
   end
 
-  def test_select_from_cached_up_votes_for_if_there_is_an_up_vote_column
+  def test_select_from_cached_up_votes_for_if_there_is_an_up_vote_column_dup
     votable_cache.vote_by(:voter => voter, :vote_scope => "test")
     votable_cache.cached_scoped_test_votes_up = 50
     assert_equal votable_cache.count_votes_up(false, "test"), 50
   end
 
-  def test_select_from_cached_down_votes_for_if_there_is_a_down_vote_column
+  def test_select_from_cached_down_votes_for_if_there_is_a_down_vote_column_dup
     votable_cache.vote_by(:voter => voter, :vote => 'false', :vote_scope => "test")
     votable_cache.cached_scoped_test_votes_down = 50
     assert_equal votable_cache.count_votes_down(false, "test"), 50

data/test/acts_as_votable/voter_test.rb

@@ -188,7 +188,7 @@ class VoterTest < ActiveSupport::TestCase
   end
 
   # describe '#find_up_voted_items
-  def test_returns_objects_that_a_user_has_upvoted_for
+  def test_returns_objects_that_a_user_has_upvoted_for_dup
     votable.vote_by(:voter => voter)
     votables(:votable2).vote_by :voter => voters(:voter2)
     assert voter.find_up_voted_items.include? votable
@@ -197,7 +197,7 @@ class VoterTest < ActiveSupport::TestCase
     assert_equal voter.find_liked_items.size, 1
   end
 
-  def test_returns_objects_that_a_user_has_upvoted_for_using_scope
+  def test_returns_objects_that_a_user_has_upvoted_for_using_scope_dup
     votable.vote_by(:voter => voter, :vote_scope => 'rank')
     votables(:votable2).vote_by(:voter => voters(:voter2), :vote_scope => 'rank')
     assert voter.find_up_voted_items(:vote_scope => 'rank').include? votable
@@ -226,7 +226,7 @@ class VoterTest < ActiveSupport::TestCase
     assert_equal voter.find_down_voted_items(:vote_scope => 'rank').size, 0
   end
 
-  def test_returns_objects_that_a_user_has_downvoted_for
+  def test_returns_objects_that_a_user_has_downvoted_for_dup
     votable.vote_down voter
     votables(:votable2).vote_down voters(:voter2)
     assert voter.find_down_voted_items.include? votable
@@ -235,7 +235,7 @@ class VoterTest < ActiveSupport::TestCase
     assert_equal voter.find_disliked_items.size, 1
   end
 
-  def test_returns_objects_that_a_user_has_downvoted_for_using_scope
+  def test_returns_objects_that_a_user_has_downvoted_for_using_scope_dup
     votable.vote_down voter, :vote_scope => 'rank'
     votables(:votable2).vote_down voters(:voter2), :vote_scope => 'rank'
     assert voter.find_down_voted_items(:vote_scope => 'rank').include? votable

data/test/database.yml

@@ -1,17 +1,17 @@
 sqlite:
   adapter: sqlite3
-  database: ':memory:'
+  database: ":memory:"
 
 mysql:
   adapter: mysql2
   database: redmineup_test
   username: root
   password: password
-  host: 127.0.0.1
+  host: mysql
 
 postgresql:
   adapter: postgresql
   database: redmineup_test
   user: postgres
   password: password
-  host: 127.0.0.1
+  host: postgres

data/test/liquid/filters/arrays_filter_test.rb

@@ -17,9 +17,9 @@ module Redmineup
     end
 
     def test_where_filter
-      assert_match '{"name"=>"two", "value"=>5}', @liquid_render.render("{{ objects_arr | where: 'name', 'two' }}")
-      assert_match '{"name"=>"one", "value"=>10}', @liquid_render.render("{{ objects_arr | where: 'value', 6, '>' }}")
-      assert_match '{"name"=>"one", "value"=>10}', @liquid_render.render("{{ objects_arr | where: 'name', 'on', 'match' }}")
+      assert_match ws('{"name"=>"two", "value"=>5}'), ws(@liquid_render.render("{{ objects_arr | where: 'name', 'two' }}"))
+      assert_match ws('{"name"=>"one", "value"=>10}'), ws(@liquid_render.render("{{ objects_arr | where: 'value', 6, '>' }}"))
+      assert_match ws('{"name"=>"one", "value"=>10}'), ws(@liquid_render.render("{{ objects_arr | where: 'name', 'on', 'match' }}"))
       assert_match '3', @liquid_render.render("{{ objects_arr | where: 'value', '', 'any' | size }}")
       assert_match '1', @liquid_render.render("{{ objects_arr | where: 'value', '', 'none' | size }}")
       assert_match '2', @liquid_render.render("{{ issues.all | where: 'author.name', 'Jonathan', '==' | size }}")
@@ -27,5 +27,8 @@ module Redmineup
       assert_match '0', @liquid_render.render("{{ issues.all | where: 'author.name', '', 'none' | size }}")
     end
 
+    def ws(string)
+      string.delete(' ')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-09 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -117,6 +118,7 @@ files:
 - app/assets/images/vcard.png
 - app/assets/javascripts/Chart.bundle.min.js.bak
 - app/assets/javascripts/chart.min.js
+- app/assets/javascripts/consumer.js
 - app/assets/javascripts/select2.js
 - app/assets/javascripts/select2_helpers.js
 - app/assets/stylesheets/calendars.css
@@ -125,7 +127,6 @@ files:
 - app/controllers/redmineup_controller.rb
 - app/views/redmineup/_money.html.erb
 - app/views/redmineup/settings.html.erb
-- bitbucket-pipelines.yml
 - config/currency_iso.json
 - config/locales/cs.yml
 - config/locales/de.yml
@@ -135,6 +136,8 @@ files:
 - config/routes.rb
 - doc/CHANGELOG
 - doc/LICENSE.txt
+- lib/action_cable/server/rup_configuration.rb
+- lib/action_cable/server/rup_server.rb
 - lib/application_record.rb
 - lib/redmineup.rb
 - lib/redmineup/acts_as_draftable/draft.rb
@@ -178,6 +181,8 @@ files:
 - lib/redmineup/liquid/filters/base.rb
 - lib/redmineup/liquid/filters/colors.rb
 - lib/redmineup/money_helper.rb
+- lib/redmineup/patches/action_cable_base_patch.rb
+- lib/redmineup/patches/action_cable_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

data/bitbucket-pipelines.yml

@@ -1,50 +0,0 @@
-# This is a sample build configuration for Ruby.
-# Check our guides at https://confluence.atlassian.com/x/8r-5Mw for more examples.
-# Only use spaces to indent your .yml configuration.
-# -----
-# You can specify a custom docker image from Docker Hub as your build environment.
-
-pipelines:
-  default:
-    - parallel:
-      - step:
-          name: 2.4.1 ruby
-          image: ruby:2.4.1
-          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
-          services:
-            - mysql
-            - postgres
-      - step:
-          name: 3.2.2 ruby
-          image: ruby:3.2.2
-          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
-            - bundle install
-            - bundle exec rake test DB=sqlite
-            - bundle exec rake test DB=postgresql
-            - bundle exec rake test DB=mysql
-          services:
-            - mysql
-            - postgres
-
-definitions:
-  services:
-    mysql:
-      image: mysql:5.7
-      environment:
-        MYSQL_DATABASE: redmineup_test
-        MYSQL_ROOT_PASSWORD: password
-    postgres:
-      image: postgres
-      environment:
-        POSTGRES_DB: redmineup_test
-        POSTGRES_PASSWORD: password