From 294f435452952535fd463c68d16400e061f474b0 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Sun, 12 Apr 2020 09:35:10 +0200
Subject: [PATCH] Patch integration cleanups

---
 init.rb                                          | 12 ++----------
 lib/redmine_messenger/patches/contact_patch.rb   |  2 +-
 lib/redmine_messenger/patches/db_entry_patch.rb  |  2 +-
 lib/redmine_messenger/patches/issue_patch.rb     |  2 +-
 lib/redmine_messenger/patches/password_patch.rb  |  2 +-
 lib/redmine_messenger/patches/wiki_page_patch.rb |  2 +-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/init.rb b/init.rb
index 29e0ea9..19eac27 100644
--- a/init.rb
+++ b/init.rb
@@ -1,7 +1,5 @@
 raise "\n\033[31mredmine_messenger requires ruby 2.3 or newer. Please update your ruby version.\033[0m" if RUBY_VERSION < '2.3'
 
-require_dependency 'redmine_messenger'
-
 Redmine::Plugin.register :redmine_messenger do
   name 'Redmine Messenger'
   author 'AlphaNodes GmbH'
@@ -41,12 +39,6 @@ Redmine::Plugin.register :redmine_messenger do
   }, partial: 'settings/messenger_settings'
 end
 
-begin
-  if ActiveRecord::Base.connection.table_exists?(Setting.table_name)
-    Rails.configuration.to_prepare do
-      RedmineMessenger.setup
-    end
-  end
-rescue ActiveRecord::NoDatabaseError
-  Rails.logger.error 'database not created yet'
+Rails.configuration.to_prepare do
+  RedmineMessenger.setup
 end
diff --git a/lib/redmine_messenger/patches/contact_patch.rb b/lib/redmine_messenger/patches/contact_patch.rb
index 532f50e..c19b181 100644
--- a/lib/redmine_messenger/patches/contact_patch.rb
+++ b/lib/redmine_messenger/patches/contact_patch.rb
@@ -2,7 +2,7 @@ module RedmineMessenger
   module Patches
     module ContactPatch
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.include InstanceMethods
         base.class_eval do
           after_create_commit :send_messenger_create
           after_update_commit :send_messenger_update
diff --git a/lib/redmine_messenger/patches/db_entry_patch.rb b/lib/redmine_messenger/patches/db_entry_patch.rb
index 1ec5211..0d47798 100644
--- a/lib/redmine_messenger/patches/db_entry_patch.rb
+++ b/lib/redmine_messenger/patches/db_entry_patch.rb
@@ -2,7 +2,7 @@ module RedmineMessenger
   module Patches
     module DbEntryPatch
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.include InstanceMethods
         base.class_eval do
           after_create_commit :send_messenger_create
           after_update_commit :send_messenger_update
diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb
index d578721..5010ad1 100644
--- a/lib/redmine_messenger/patches/issue_patch.rb
+++ b/lib/redmine_messenger/patches/issue_patch.rb
@@ -2,7 +2,7 @@ module RedmineMessenger
   module Patches
     module IssuePatch
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.include InstanceMethods
         base.class_eval do
           after_create_commit :send_messenger_create
           after_update_commit :send_messenger_update
diff --git a/lib/redmine_messenger/patches/password_patch.rb b/lib/redmine_messenger/patches/password_patch.rb
index b71139b..94cdeae 100644
--- a/lib/redmine_messenger/patches/password_patch.rb
+++ b/lib/redmine_messenger/patches/password_patch.rb
@@ -2,7 +2,7 @@ module RedmineMessenger
   module Patches
     module PasswordPatch
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.include InstanceMethods
         base.class_eval do
           after_create_commit :send_messenger_create
           after_update_commit :send_messenger_update
diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb
index 1486d8e..c104fcd 100644
--- a/lib/redmine_messenger/patches/wiki_page_patch.rb
+++ b/lib/redmine_messenger/patches/wiki_page_patch.rb
@@ -2,7 +2,7 @@ module RedmineMessenger
   module Patches
     module WikiPagePatch
       def self.included(base)
-        base.send(:include, InstanceMethods)
+        base.include InstanceMethods
         base.class_eval do
           after_create_commit :send_messenger_create
           after_update_commit :send_messenger_update