redmineup 1.1.11 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb516fc8ae25a65558bec625b9603e7aacd7188d473e80b23eb27223050d2ac
-  data.tar.gz: 66e4cecc1aa21ab23211e51774fbd262840f5df3efdbb9bb355d20870d142909
+  metadata.gz: a4d2181d902dbfa9a13995df17ff80c6a9eaea15fd54c6a918a6695ced32ed40
+  data.tar.gz: 88ee188a9626a4483f6ebc108a5f2ae174de4bde94e5d04128f60b0f3d6d8799
 SHA512:
-  metadata.gz: 43bddd0b96c58e00fc4645476801b1792022bce7c13588dc99f00486f77f47031e0fce58a4b5fe41d11b3dfca899527d003f294e1030957662141042e96e6a71
-  data.tar.gz: 4164a606ad2a264bb4501d3ec773215b5396b7da7dcdbc58bb09adadae630875d14dc9bdf4d669749b391ce19ff620df38c204d6474f2785f465d1e7b461a0b7
+  metadata.gz: bbd631a43429432a3c3f2e208527b601dd3d1dca57d260d314f2808d485b96d8f8ef29baf31a6836c026c30cf5d453075082d6d65cf548efba7fe5393a862b75
+  data.tar.gz: 49ccf2ace3f1af01aa00a748a94c93f6deb994fd5bc0e0a23db7f4e98c7ed371aeff27b8561a0c8cce1aeee19d9e8e5333ae4c7ee77c699bb9c8bb1c092daff3

data/app/assets/javascripts/consumer_worker.js

@@ -1,5 +1,7 @@
 const connections = new Map();
 const MAX_PENDING_ACK = 3;
+const RETRY_BASE_DELAY = 5000;
+const RETRY_MAX_DELAY = 320000;
 
 self.onconnect = function (event) {
   const clientPort = event.ports[0];
@@ -114,26 +116,41 @@ function sendSubscribe(socket, identifier) {
 }
 
 function initSocketStruct() {
-  return { socket: null, clients: new Map() };
+  return { socket: null, clients: new Map(), retryDelay: RETRY_BASE_DELAY };
 }
 
 function initWebSocket(url) {
   const conn = connections.get(url);
   if (!conn) return;
 
-  conn.socket = new WebSocket(url);
+  if (conn.socket) {
+    try {
+      conn.socket.onopen =
+        conn.socket.onmessage =
+        conn.socket.onclose =
+        conn.socket.onerror =
+          null;
+      conn.socket.close();
+    } catch (e) {}
+  }
+
+  const socket = new WebSocket(url);
+  conn.socket = socket;
 
   conn.socket.onopen = function () {
+    if (conn.socket !== socket) return;
+    conn.retryDelay = RETRY_BASE_DELAY;
     const seen = new Set();
     for (const { channelIdentifier } of conn.clients.values()) {
       if (!seen.has(channelIdentifier)) {
         seen.add(channelIdentifier);
-        sendSubscribe(conn.socket, channelIdentifier);
+        sendSubscribe(socket, channelIdentifier);
       }
     }
   };
 
   conn.socket.onmessage = function (event) {
+    if (conn.socket !== socket) return;
     const messageData = (event.data && JSON.parse(event.data)) || {};
 
     if (messageData.type === "confirm_subscription") {
@@ -154,15 +171,18 @@ function initWebSocket(url) {
     });
   };
 
-  conn.socket.onclose = function () {
+  socket.onclose = function () {
+    if (conn.socket !== socket) return;
     broadcastTo(conn, { type: "disconnected" });
+    const delay = conn.retryDelay;
+    conn.retryDelay = Math.min(conn.retryDelay * 2, RETRY_MAX_DELAY);
     setTimeout(function () {
-      if (connections.has(url)) initWebSocket(url);
-    }, 5000);
+      if (connections.has(url) && conn.socket === socket) initWebSocket(url);
+    }, delay);
   };
 
-  conn.socket.onerror = function (error) {
-    conn.socket.close();
+  socket.onerror = function (error) {
+    socket.close();
   };
 }
 

data/doc/CHANGELOG

@@ -4,6 +4,15 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-08-25 v1.1.13
+
+* Updated patches from include to prepend
+
+== 2026-07-23 v1.1.12
+
+* Fixed race condition and added exponential backoff to shared worker websocket reconnect logic
+* Added `Redmineup::TestHelper#load_plugin_fixtures` for loading plugin test fixtures
+
 == 2026-06-26 v1.1.11
 
 * Added shared workers for websocket connection

data/lib/redmineup/helpers/test_helper.rb

@@ -0,0 +1,12 @@
+module Redmineup
+  module TestHelper
+    module ClassMethods
+      def load_plugin_fixtures(plugin_name, *names)
+        fixtures_dir = File.join(Redmine::Plugin.find(plugin_name).directory, 'test', 'fixtures')
+        ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, names)
+      end
+    end
+  end
+end
+
+ActiveSupport::TestCase.extend Redmineup::TestHelper::ClassMethods

data/lib/redmineup/patches/action_cable_base_patch.rb

@@ -1,9 +1,9 @@
 module Redmineup
   module Patches
     module ActionCableBasePatch
-      def self.included(base)
-        base.send(:extend, ClassMethods)
-        delegate :rup_broadcast_to, to: :class
+      def self.prepended(base)
+        base.extend(ClassMethods)
+        base.delegate :rup_broadcast_to, to: :class
       end
 
       module ClassMethods
@@ -22,6 +22,4 @@ module Redmineup
   end
 end
 
-unless ActionCable::Channel::Base.included_modules.include?(Redmineup::Patches::ActionCableBasePatch)
-  ActionCable::Channel::Base.send(:include, Redmineup::Patches::ActionCableBasePatch)
-end
+ActionCable::Channel::Base.prepend(Redmineup::Patches::ActionCableBasePatch)

data/lib/redmineup/patches/action_cable_patch.rb

@@ -1,7 +1,7 @@
 module Redmineup
   module Patches
     module ActionCablePatch
-      def self.included(base)
+      def self.prepended(base)
         base.class_eval do
           module_function def rup_server(klass = 'ActionCable::Connection::RupConnection')
             @rup_servers ||= {}
@@ -16,6 +16,4 @@ module Redmineup
   end
 end
 
-unless ActionCable.included_modules.include?(Redmineup::Patches::ActionCablePatch)
-  ActionCable.include Redmineup::Patches::ActionCablePatch
-end
+ActionCable.prepend(Redmineup::Patches::ActionCablePatch)

data/lib/redmineup/patches/auto_completes_controller_patch.rb

@@ -14,6 +14,4 @@ module Redmineup
   end
 end
 
-unless AutoCompletesController.included_modules.include?(Redmineup::Patches::AutoCompletesControllerPatch)
-  AutoCompletesController.include(Redmineup::Patches::AutoCompletesControllerPatch)
-end
+AutoCompletesController.prepend(Redmineup::Patches::AutoCompletesControllerPatch)

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

@@ -2,28 +2,15 @@ module Redmineup
   module Patches
     module Compatibility
       module RoutingMapperPatch
-        def self.included(base)
-          base.send(:include, InstanceMethods)
+        def constraints(options = {}, &block)
+          return super(options, &block) unless options.is_a?(Hash)
 
-          base.class_eval do
-            alias_method :constraints_without_redmineup, :constraints
-            alias_method :constraints, :constraints_with_redmineup
-          end
-        end
-
-        module InstanceMethods
-          def constraints_with_redmineup(options = {}, &block)
-            return constraints_without_redmineup(options, &block) unless options.is_a?(Hash)
-
-            options[:object_type] = /.+/ if options[:object_type] && options[:object_type].is_a?(Regexp)
-            constraints_without_redmineup(options, &block)
-          end
+          options[:object_type] = /.+/ if options[:object_type] && options[:object_type].is_a?(Regexp)
+          super(options, &block)
         end
       end
     end
   end
 end
 
-unless ActionDispatch::Routing::Mapper.included_modules.include?(Redmineup::Patches::Compatibility::RoutingMapperPatch)
-  ActionDispatch::Routing::Mapper.send(:include, Redmineup::Patches::Compatibility::RoutingMapperPatch)
-end
+ActionDispatch::Routing::Mapper.prepend(Redmineup::Patches::Compatibility::RoutingMapperPatch)

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

@@ -2,18 +2,12 @@ module Redmineup
   module Patches
     module Compatibility
       module SpritePatch
-        def self.included(base)
-          base.class_eval do
-            def sprite_icon(icon_name, label = '', icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil, rtl: false)
-              label
-            end
-          end
+        def sprite_icon(icon_name, label = '', icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil, rtl: false)
+          label
         end
       end
     end
   end
 end
 
-unless ApplicationHelper.included_modules.include?(Redmineup::Patches::Compatibility::SpritePatch)
-  ApplicationHelper.send(:include, Redmineup::Patches::Compatibility::SpritePatch)
-end
+ApplicationHelper.prepend(Redmineup::Patches::Compatibility::SpritePatch)

data/lib/redmineup/patches/compatibility_patch.rb

@@ -1,9 +1,3 @@
-if Redmine::VERSION.to_s < "4" 
-  require 'redmineup/patches/compatibility/application_controller_patch'
-end
-if Redmine::VERSION.to_s < "5" 
-  require 'redmineup/patches/compatibility/user_patch'
-end
 if Redmine::VERSION.to_s < "6"
   require 'redmineup/patches/compatibility/sprite_patch'
 end

data/lib/redmineup/patches/liquid_patch.rb

@@ -2,32 +2,23 @@ module Redmineup
   module Patches
     module LiquidPatch
       module StandardFilters
+        private
 
-        def self.included(base)
-          base.class_eval do
-            
-            private
-    
-            def to_number(obj)
-              case obj
-              when Float
-                BigDecimal(obj.to_s)
-              when Numeric
-                obj
-              when String
-                (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal(obj) : obj.to_i
-              else
-                0
-              end
-            end
+        def to_number(obj)
+          case obj
+          when Float
+            BigDecimal(obj.to_s)
+          when Numeric
+            obj
+          when String
+            (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal(obj) : obj.to_i
+          else
+            0
           end
         end
-
       end
     end
   end
 end
-  
-unless Liquid::StandardFilters.included_modules.include?(Redmineup::Patches::LiquidPatch::StandardFilters)
-  Liquid::StandardFilters.send(:include, Redmineup::Patches::LiquidPatch::StandardFilters)
-end
+
+Liquid::StandardFilters.prepend(Redmineup::Patches::LiquidPatch::StandardFilters)

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.1.11'
+  VERSION = '1.1.13'
 end

data/lib/redmineup.rb

@@ -45,6 +45,7 @@ require 'redmineup/helpers/external_assets_helper'
 require 'redmineup/helpers/form_tag_helper'
 require 'redmineup/helpers/calendars_helper'
 require 'redmineup/helpers/datetime_helper'
+require 'redmineup/helpers/test_helper'
 require 'redmineup/assets_manager'
 
 require 'redmineup/patches/liquid_patch'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.13
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,6 +174,7 @@ files:
 - lib/redmineup/helpers/external_assets_helper.rb
 - lib/redmineup/helpers/form_tag_helper.rb
 - lib/redmineup/helpers/tags_helper.rb
+- lib/redmineup/helpers/test_helper.rb
 - lib/redmineup/helpers/vote_helper.rb
 - lib/redmineup/hooks/views_layouts_hook.rb
 - lib/redmineup/liquid/drops/attachment_drop.rb
@@ -193,10 +194,8 @@ files:
 - 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
-- lib/redmineup/patches/compatibility/user_patch.rb
 - lib/redmineup/patches/compatibility_patch.rb
 - lib/redmineup/patches/liquid_patch.rb
 - lib/redmineup/settings.rb

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

@@ -1,32 +0,0 @@
-module Redmineup
-  module Patches
-    module Compatibility
-      module ApplicationControllerPatch
-        def self.included(base) # :nodoc:
-          base.extend(ClassMethods)
-          base.class_eval do
-            unloadable # Send unloadable so it will not be unloaded in development
-          end
-        end
-
-        module ClassMethods
-          def before_action(*filters, &block)
-            before_filter(*filters, &block)
-          end
-
-          def after_action(*filters, &block)
-            after_filter(*filters, &block)
-          end
-
-          def skip_before_action(*filters, &block)
-            skip_before_filter(*filters, &block)
-          end
-        end
-      end
-    end
-  end
-end
-
-unless ActionController::Base.methods.include?(:before_action)
-  ActionController::Base.send(:include,Redmineup::Patches::Compatibility::ApplicationControllerPatch)
-end

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

@@ -1,21 +0,0 @@
-module Redmineup
-  module Patches
-    module Compatibility
-      module UserPatch
-        def self.included(base)
-          base.send(:include, InstanceMethods)
-        end
-
-        module InstanceMethods
-          def atom_key
-            rss_key
-          end
-        end
-      end
-    end
-  end
-end
-
-unless User.included_modules.include?(Redmineup::Patches::Compatibility::UserPatch)
-  User.send(:include, Redmineup::Patches::Compatibility::UserPatch)
-end