Extract methods

Author: root

Diff for: app/models/concerns/gitolitable/users.rb

@@ -3,37 +3,54 @@ module Users
     extend ActiveSupport::Concern
 
     def gitolite_users
-      data = {}
-
       if project.active?
-        # Add project users
-        data[:rewind_users]   = rewind_users
-        data[:write_users]    = write_users
-        data[:read_users]     = read_users
-        data[:developer_team] = developer_team
-        data[:all_read]       = all_read
-
-        # Add Řepository Deployment keys
-        deployment_credentials.active.each do |cred|
-          if cred.perm == 'RW+'
-            data[:rewind_users] << cred.gitolite_public_key.owner
-          elsif cred.perm == 'R'
-            data[:read_users] << cred.gitolite_public_key.owner
-          end
-        end
-
-        # Add other users
-        data[:read_users] << 'DUMMY_REDMINE_KEY' if read_users.empty? && write_users.empty? && rewind_users.empty?
-        data[:read_users] << 'gitweb' if git_web_available?
-        data[:read_users] << 'daemon' if git_daemon_available?
-
+        users_for_active_project
       elsif project.archived?
-        data[:read_users] = ['REDMINE_ARCHIVED_PROJECT']
+        users_for_archived_project
       else
-        data[:read_users] = all_read
-        data[:read_users] << 'REDMINE_CLOSED_PROJECT'
+        users_for_closed_project
+      end
+    end
+
+
+    def users_for_active_project
+      data = {}
+      data[:rewind_users]   = rewind_users
+      data[:write_users]    = write_users
+      data[:read_users]     = read_users
+      data[:developer_team] = developer_team
+      data[:all_read]       = all_read
+
+      # Add Řepository Deployment keys
+      deployment_credentials.active.each do |cred|
+        if cred.perm == 'RW+'
+          data[:rewind_users] << cred.gitolite_public_key.owner
+        elsif cred.perm == 'R'
+          data[:read_users] << cred.gitolite_public_key.owner
+        end
       end
 
+      # Add other users
+      data[:read_users] << 'DUMMY_REDMINE_KEY' if read_users.empty? && write_users.empty? && rewind_users.empty?
+      data[:read_users] << 'gitweb' if git_web_available?
+      data[:read_users] << 'daemon' if git_daemon_available?
+
+      # Return users
+      data
+    end
+
+
+    def users_for_archived_project
+      data = {}
+      data[:read_users] = ['REDMINE_ARCHIVED_PROJECT']
+      data
+    end
+
+
+    def users_for_closed_project
+      data = {}
+      data[:read_users] = all_read
+      data[:read_users] << 'REDMINE_CLOSED_PROJECT'
       data
     end
 

Diff for: app/services/permissions_builder/base.rb

@@ -73,6 +73,11 @@ def build
     private
 
 
+      def has_no_users?(type)
+        gitolite_users[type].nil? || gitolite_users[type].empty?
+      end
+
+
       def merge_permissions(current_permissions, old_permissions)
         merge_permissions = {}
         merge_permissions['RW+'] = {}

Diff for: app/services/permissions_builder/protected_branches.rb

@@ -30,7 +30,7 @@ def build_protected_branch_permissions
         end
       end
 
-      @permissions['RW+']['personal/USER/'] = gitolite_users[:developer_team] unless gitolite_users[:developer_team].empty?
+      @permissions['RW+']['personal/USER/'] = gitolite_users[:developer_team] unless has_no_users?(:developer_team)
     end
 
   end

Diff for: app/services/permissions_builder/standard.rb

@@ -23,9 +23,9 @@ def build
 
 
     def build_permissions
-      @permissions['RW+'][''] = gitolite_users[:rewind_users] unless gitolite_users[:rewind_users].empty?
-      @permissions['RW']['']  = gitolite_users[:write_users]  unless gitolite_users[:write_users].empty?
-      @permissions['R']['']   = gitolite_users[:read_users]   unless gitolite_users[:read_users].empty?
+      @permissions['RW+'][''] = gitolite_users[:rewind_users] unless has_no_users?(:rewind_users)
+      @permissions['RW']['']  = gitolite_users[:write_users]  unless has_no_users?(:write_users)
+      @permissions['R']['']   = gitolite_users[:read_users]   unless has_no_users?(:read_users)
     end
 
   end