From c7f97afc0c2b7eb36c951fb201e1298635af39cc Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Fri, 27 Jul 2018 19:58:10 +0200
Subject: [PATCH] patch apply refactored

---
 lib/redmine_messenger.rb                         | 13 ++++++-------
 lib/redmine_messenger/helpers.rb                 |  2 --
 lib/redmine_messenger/patches/contact_patch.rb   |  4 ----
 lib/redmine_messenger/patches/db_entry_patch.rb  |  4 ----
 lib/redmine_messenger/patches/wiki_page_patch.rb |  4 ----
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lib/redmine_messenger.rb b/lib/redmine_messenger.rb
index 5db7572..bd53a6e 100644
--- a/lib/redmine_messenger.rb
+++ b/lib/redmine_messenger.rb
@@ -16,16 +16,15 @@ Rails.configuration.to_prepare do
   end
 
   # Patches
-  require_dependency 'redmine_messenger/patches/issue_patch'
-  require_dependency 'redmine_messenger/patches/wiki_page_patch'
+  Issue.send(:include, RedmineMessenger::Patches::IssuePatch)
+  WikiPage.send(:include, RedmineMessenger::Patches::WikiPagePatch)
   ProjectsController.send :helper, MessengerProjectsHelper
-
-  require 'redmine_messenger/patches/contact_patch' if RedmineMessenger::REDMINE_CONTACTS_SUPPORT
-  require 'redmine_messenger/patches/db_entry_patch' if RedmineMessenger::REDMINE_DB_SUPPORT
-  require 'redmine_messenger/patches/password_patch' if Redmine::Plugin.installed?('redmine_passwords')
+  Contact.send(:include, RedmineMessenger::Patches::ContactPatch) if RedmineMessenger::REDMINE_CONTACTS_SUPPORT
+  DbEntry.send(:include, RedmineMessenger::Patches::DbEntryPatch) if RedmineMessenger::REDMINE_DB_SUPPORT
+  Password.send(:include, RedmineMessenger::Patches::PasswordPatch) if Redmine::Plugin.installed?('redmine_passwords')
 
   # Global helpers
-  require_dependency 'redmine_messenger/helpers'
+  ActionView::Base.send :include, RedmineMessenger::Helpers
 
   # Hooks
   require_dependency 'redmine_messenger/hooks'
diff --git a/lib/redmine_messenger/helpers.rb b/lib/redmine_messenger/helpers.rb
index b8fccfb..6e0eed5 100644
--- a/lib/redmine_messenger/helpers.rb
+++ b/lib/redmine_messenger/helpers.rb
@@ -15,5 +15,3 @@ module RedmineMessenger
     end
   end
 end
-
-ActionView::Base.send :include, RedmineMessenger::Helpers
diff --git a/lib/redmine_messenger/patches/contact_patch.rb b/lib/redmine_messenger/patches/contact_patch.rb
index f80bbb6..91f9551 100644
--- a/lib/redmine_messenger/patches/contact_patch.rb
+++ b/lib/redmine_messenger/patches/contact_patch.rb
@@ -45,7 +45,3 @@ module RedmineMessenger
     end
   end
 end
-
-unless Contact.included_modules.include? RedmineMessenger::Patches::ContactPatch
-  Contact.send(:include, RedmineMessenger::Patches::ContactPatch)
-end
diff --git a/lib/redmine_messenger/patches/db_entry_patch.rb b/lib/redmine_messenger/patches/db_entry_patch.rb
index 6e4aa33..68a31cf 100644
--- a/lib/redmine_messenger/patches/db_entry_patch.rb
+++ b/lib/redmine_messenger/patches/db_entry_patch.rb
@@ -46,7 +46,3 @@ module RedmineMessenger
     end
   end
 end
-
-unless DbEntry.included_modules.include? RedmineMessenger::Patches::DbEntryPatch
-  DbEntry.send(:include, RedmineMessenger::Patches::DbEntryPatch)
-end
diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb
index 92ff6f7..d56413d 100644
--- a/lib/redmine_messenger/patches/wiki_page_patch.rb
+++ b/lib/redmine_messenger/patches/wiki_page_patch.rb
@@ -50,7 +50,3 @@ module RedmineMessenger
     end
   end
 end
-
-unless WikiPage.included_modules.include? RedmineMessenger::Patches::WikiPagePatch
-  WikiPage.send(:include, RedmineMessenger::Patches::WikiPagePatch)
-end