Replace alias_method_chain by Module prepend

Author: root

Diff for: lib/redmine_git_hosting/patches/changeset_patch.rb

@@ -4,76 +4,67 @@ module RedmineGitHosting
   module Patches
     module ChangesetPatch
 
-      def self.included(base)
-        base.send(:include, InstanceMethods)
+      def github_payload
+        data = {}
+        data[:id]        = revision
+        data[:message]   = comments
+        data[:timestamp] = committed_on
+        data[:author]    = author_data
+        data[:added]     = added_files
+        data[:modified]  = modified_files
+        data[:removed]   = removed_files
+        data[:url]       = url_for_revision(revision)
+        data
       end
 
 
-      module InstanceMethods
-
-        def github_payload
-          data = {}
-          data[:id]        = revision
-          data[:message]   = comments
-          data[:timestamp] = committed_on
-          data[:author]    = author_data
-          data[:added]     = added_files
-          data[:modified]  = modified_files
-          data[:removed]   = removed_files
-          data[:url]       = url_for_revision(revision)
-          data
-        end
-
-
-        def author_data
-          { name: author_name, email: author_email }
-        end
-
+      def author_data
+        { name: author_name, email: author_email }
+      end
 
-        def author_name
-          RedmineGitHosting::Utils::Git.author_name(committer)
-        end
 
+      def author_name
+        RedmineGitHosting::Utils::Git.author_name(committer)
+      end
 
-        def author_email
-          RedmineGitHosting::Utils::Git.author_email(committer)
-        end
 
+      def author_email
+        RedmineGitHosting::Utils::Git.author_email(committer)
+      end
 
-        def added_files
-          filechanges_by_action('A')
-        end
 
+      def added_files
+        filechanges_by_action('A')
+      end
 
-        def modified_files
-          filechanges_by_action('M')
-        end
 
+      def modified_files
+        filechanges_by_action('M')
+      end
 
-        def removed_files
-          filechanges_by_action('D')
-        end
 
+      def removed_files
+        filechanges_by_action('D')
+      end
 
-        def filechanges_by_action(action)
-          filechanges.select { |c| c.action == action }.map(&:path)
-        end
 
+      def filechanges_by_action(action)
+        filechanges.select { |c| c.action == action }.map(&:path)
+      end
 
-        def url_for_revision(revision)
-          Rails.application.routes.url_helpers.url_for(
-            controller: 'repositories', action: 'revision',
-            id: project, repository_id: repository.identifier_param, rev: revision,
-            only_path: false, host: Setting['host_name'], protocol: Setting['protocol']
-          )
-        end
 
+      def url_for_revision(revision)
+        Rails.application.routes.url_helpers.url_for(
+          controller: 'repositories', action: 'revision',
+          id: project, repository_id: repository.identifier_param, rev: revision,
+          only_path: false, host: Setting['host_name'], protocol: Setting['protocol']
+        )
       end
 
     end
   end
 end
 
 unless Changeset.included_modules.include?(RedmineGitHosting::Patches::ChangesetPatch)
-  Changeset.send(:include, RedmineGitHosting::Patches::ChangesetPatch)
+  Changeset.send(:prepend, RedmineGitHosting::Patches::ChangesetPatch)
 end

Diff for: lib/redmine_git_hosting/patches/group_patch.rb

@@ -4,42 +4,34 @@ module RedmineGitHosting
   module Patches
     module GroupPatch
 
-      def self.included(base)
-        base.send(:include, InstanceMethods)
+      def self.prepended(base)
         base.class_eval do
           # Relations
           has_many :protected_branches_members, dependent: :destroy, foreign_key: :principal_id
           has_many :protected_branches, through: :protected_branches_members
-
-          alias_method_chain :user_added,   :git_hosting
-          alias_method_chain :user_removed, :git_hosting
         end
       end
 
 
-      module InstanceMethods
-
-        def user_added_with_git_hosting(user, &block)
-          user_added_without_git_hosting(user, &block)
-          protected_branches.each do |pb|
-            RepositoryProtectedBranches::MemberManager.new(pb).add_user_from_group(user, self.id)
-          end
+      def user_added(user)
+        super
+        protected_branches.each do |pb|
+          RepositoryProtectedBranches::MemberManager.new(pb).add_user_from_group(user, self.id)
         end
+      end
 
 
-        def user_removed_with_git_hosting(user, &block)
-          user_removed_without_git_hosting(user, &block)
-          protected_branches.each do |pb|
-            RepositoryProtectedBranches::MemberManager.new(pb).remove_user_from_group(user, self.id)
-          end
+      def user_removed(user)
+        super
+        protected_branches.each do |pb|
+          RepositoryProtectedBranches::MemberManager.new(pb).remove_user_from_group(user, self.id)
         end
-
       end
 
     end
   end
 end
 
 unless Group.included_modules.include?(RedmineGitHosting::Patches::GroupPatch)
-  Group.send(:include, RedmineGitHosting::Patches::GroupPatch)
+  Group.send(:prepend, RedmineGitHosting::Patches::GroupPatch)
 end

Diff for: lib/redmine_git_hosting/patches/issue_patch.rb

@@ -4,7 +4,7 @@ module RedmineGitHosting
   module Patches
     module IssuePatch
 
-      def self.included(base)
+      def self.prepended(base)
         base.class_eval do
           has_one :github_issue, foreign_key: 'issue_id', class_name: 'GithubIssue', dependent: :destroy
         end
@@ -15,5 +15,5 @@ def self.included(base)
 end
 
 unless Issue.included_modules.include?(RedmineGitHosting::Patches::IssuePatch)
-  Issue.send(:include, RedmineGitHosting::Patches::IssuePatch)
+  Issue.send(:prepend, RedmineGitHosting::Patches::IssuePatch)
 end

Diff for: lib/redmine_git_hosting/patches/journal_patch.rb

@@ -4,7 +4,7 @@ module RedmineGitHosting
   module Patches
     module JournalPatch
 
-      def self.included(base)
+      def self.prepended(base)
         base.class_eval do
           has_one :github_comment, foreign_key: 'journal_id', class_name: 'GithubComment', dependent: :destroy
         end
@@ -15,5 +15,5 @@ def self.included(base)
 end
 
 unless Journal.included_modules.include?(RedmineGitHosting::Patches::JournalPatch)
-  Journal.send(:include, RedmineGitHosting::Patches::JournalPatch)
+  Journal.send(:prepend, RedmineGitHosting::Patches::JournalPatch)
 end

Diff for: lib/redmine_git_hosting/patches/member_patch.rb

@@ -4,30 +4,25 @@ module RedmineGitHosting
   module Patches
     module MemberPatch
 
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-        base.send(:include, RedmineGitHosting::GitoliteAccessor::Methods)
+      include RedmineGitHosting::GitoliteAccessor::Methods
+
+      def self.prepended(base)
         base.class_eval do
           after_commit :update_project
         end
       end
 
+      private
 
-      module InstanceMethods
-
-        private
-
-          def update_project
-            options = { message: "Membership changes on project '#{project}', update!" }
-            gitolite_accessor.update_projects([project.id], options)
-          end
-
-      end
+        def update_project
+          options = { message: "Membership changes on project '#{project}', update!" }
+          gitolite_accessor.update_projects([project.id], options)
+        end
 
     end
   end
 end
 
 unless Member.included_modules.include?(RedmineGitHosting::Patches::MemberPatch)
-  Member.send(:include, RedmineGitHosting::Patches::MemberPatch)
+  Member.send(:prepend, RedmineGitHosting::Patches::MemberPatch)
 end

Diff for: lib/redmine_git_hosting/patches/project_patch.rb

@@ -4,8 +4,7 @@ module RedmineGitHosting
   module Patches
     module ProjectPatch
 
-      def self.included(base)
-        base.send(:include, InstanceMethods)
+      def self.prepended(base)
         base.class_eval do
           # Add custom scope
           scope :active_or_closed, -> { where("status = #{Project::STATUS_ACTIVE} OR status = #{Project::STATUS_CLOSED}") }
@@ -19,51 +18,47 @@ def self.included(base)
       end
 
 
-      module InstanceMethods
-
-        # Find all repositories owned by project which are Repository::Xitolite
-        def gitolite_repos
-          repositories.select { |x| x.is_a?(Repository::Xitolite) }.sort { |x, y| x.id <=> y.id }
-        end
+      # Find all repositories owned by project which are Repository::Xitolite
+      def gitolite_repos
+        repositories.select { |x| x.is_a?(Repository::Xitolite) }.sort { |x, y| x.id <=> y.id }
+      end
 
 
-        # Return first repo with a blank identifier (should be only one!)
-        def repo_blank_ident
-          Repository.where("project_id = ? and (identifier = '' or identifier is null)", id).first
-        end
+      # Return first repo with a blank identifier (should be only one!)
+      def repo_blank_ident
+        Repository.where("project_id = ? and (identifier = '' or identifier is null)", id).first
+      end
 
 
-        def users_available
-          get_members_available('User')
-        end
+      def users_available
+        get_members_available('User')
+      end
 
 
-        def groups_available
-          get_members_available('Group')
-        end
+      def groups_available
+        get_members_available('Group')
+      end
 
 
-        private
+      private
 
 
-          def get_members_available(klass)
-            memberships.active.map(&:principal).select { |m| m.class.name == klass }.uniq.sort
-          end
+        def get_members_available(klass)
+          memberships.active.map(&:principal).select { |m| m.class.name == klass }.uniq.sort
+        end
 
 
-          def additional_constraints_on_identifier
-            if new_record? && !identifier.blank?
-              # Make sure that identifier does not match existing repository identifier
-              errors.add(:identifier, :taken) if Repository.find_by_identifier_and_type(identifier, 'Repository::Xitolite')
-            end
+        def additional_constraints_on_identifier
+          if new_record? && !identifier.blank?
+            # Make sure that identifier does not match existing repository identifier
+            errors.add(:identifier, :taken) if Repository.find_by_identifier_and_type(identifier, 'Repository::Xitolite')
           end
-
-      end
+        end
 
     end
   end
 end
 
 unless Project.included_modules.include?(RedmineGitHosting::Patches::ProjectPatch)
-  Project.send(:include, RedmineGitHosting::Patches::ProjectPatch)
+  Project.send(:prepend, RedmineGitHosting::Patches::ProjectPatch)
 end