Update CI config: add Redmine 5

.github/workflows/4_1_7.yml → .github/workflows/5_1_1.yml

@@ -1,8 +1,8 @@
-name: Tests 4.1.7
+name: Tests 5.1.1
 
 env:
   PLUGIN_NAME: redmine_notified
-  REDMINE_VERSION: 4.1.7
+  REDMINE_VERSION: 5.1.1
   RAILS_ENV: test
 
 on:
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6']
+        ruby: ['3.1']
         db: ['postgres']
       fail-fast: false
 

.github/workflows/master.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7']
+        ruby: ['3.1']
         db: ['postgres']
       fail-fast: false
 

README.md

@@ -33,11 +33,11 @@ Test status
 |Plugin branch| Redmine Version   | Test Status      |
 |-------------|-------------------|------------------|
 |master       | 4.2.11            | [![4.2.11][1]][5]|
-|master       | 4.1.7             | [![4.1.7][2]][5] |
+|master       | 5.1.1             | [![5.1.1][2]][5] |
 |master       | master            | [![master][4]][5]|
 
 [1]: https://github.com/jbbarth/redmine_notified/actions/workflows/4_2_11.yml/badge.svg
-[2]: https://github.com/jbbarth/redmine_notified/actions/workflows/4_1_7.yml/badge.svg
+[2]: https://github.com/jbbarth/redmine_notified/actions/workflows/5_1_1.yml/badge.svg
 [4]: https://github.com/jbbarth/redmine_notified/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/jbbarth/redmine_notified/actions
 

init.rb

@@ -1,10 +1,5 @@
 require 'redmine'
-require 'redmine_notified/hooks'
-
-ActiveSupport::Reloader.to_prepare do
-  require_dependency 'redmine_notified/mail_notifications_subscriber'
-  require_dependency 'redmine_notified/notifications_association_patch'
-end
+require_relative 'lib/redmine_notified/hooks'
 
 Redmine::Plugin.register :redmine_notified do
   name 'Redmine Notified plugin'

lib/redmine_notified/hooks.rb

@@ -1,8 +1,17 @@
 module RedmineNotified
+
   class Hooks < Redmine::Hook::ViewListener
     #adds our css on each page
     def view_layouts_base_html_head(context)
       stylesheet_link_tag('plugin', :plugin => "redmine_notified")
     end
   end
+
+  class ModelHook < Redmine::Hook::Listener
+    def after_plugins_loaded(_context = {})
+      require_relative 'mail_notifications_subscriber'
+      require_relative 'notifications_association_patch'
+    end
+  end
+
 end

lib/redmine_notified/mail_notifications_subscriber.rb

@@ -1,24 +1,28 @@
-ActiveSupport::Notifications.subscribe "deliver.action_mailer" do |name, start, finish, id, payload|
-  attrs = payload.dup.stringify_keys
-  %w(from to cc bcc).each do |key|
-    attrs[key] = attrs[key].join(", ") if attrs.has_key?(key) && attrs[key].is_a?(Enumerable)
-  end
-  attrs['mail'] = nil
-  begin
-    new_notif = Notification.new(attrs.slice(*Notification.column_names))
-    new_notif.infer_object_from_message_id
-    old_notif = Notification.where(:notificable_type => new_notif.notificable_type, :notificable_id => new_notif.notificable_id).first
-    if old_notif
-      bcc = []
-      bcc |= old_notif.bcc.split(', ') if old_notif.bcc.present?
-      bcc |= new_notif.bcc.split(', ') if new_notif.bcc.present?
-      old_notif.bcc = bcc.join(", ")
-      old_notif.save
-    else
-      new_notif.save
+module RedmineNotified
+  module MailNotificationsSubscriber
+    ActiveSupport::Notifications.subscribe "deliver.action_mailer" do |name, start, finish, id, payload|
+      attrs = payload.dup.stringify_keys
+      %w(from to cc bcc).each do |key|
+        attrs[key] = attrs[key].join(", ") if attrs.has_key?(key) && attrs[key].is_a?(Enumerable)
+      end
+      attrs['mail'] = nil
+      begin
+        new_notif = Notification.new(attrs.slice(*Notification.column_names))
+        new_notif.infer_object_from_message_id
+        old_notif = Notification.where(:notificable_type => new_notif.notificable_type, :notificable_id => new_notif.notificable_id).first
+        if old_notif
+          bcc = []
+          bcc |= old_notif.bcc.split(', ') if old_notif.bcc.present?
+          bcc |= new_notif.bcc.split(', ') if new_notif.bcc.present?
+          old_notif.bcc = bcc.join(", ")
+          old_notif.save
+        else
+          new_notif.save
+        end
+      rescue
+        #this shouldn't happen, but hey, we don't want to prevent ticket creation if anything fails
+        Rails.logger.error("ERROR: redmine_notified plugin, unable to add notification for #{attrs.inspect}")
+      end
     end
-  rescue
-    #this shouldn't happen, but hey, we don't want to prevent ticket creation if anything fails
-    Rails.logger.error("ERROR: redmine_notified plugin, unable to add notification for #{attrs.inspect}")
   end
 end

lib/redmine_notified/notifications_association_patch.rb

@@ -1,4 +1,4 @@
-module NotificationsAssociationPatch
+module RedmineNotified::NotificationsAssociationPatch
   def self.included(base)
     base.class_eval do
       has_many :notifications, :as => :notificable
@@ -8,5 +8,5 @@ def self.included(base)
 
 %w(issue journal news comment message wiki_content).each do |klass|
   require_dependency klass
-  klass.camelize.constantize.send(:include, NotificationsAssociationPatch)
+  klass.camelize.constantize.send(:include, RedmineNotified::NotificationsAssociationPatch)
 end