Use Contributor class instead of hash

4 files changed, 16 insertions, 17 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index a2285bb5dab..89bf12ce9ef 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -244,28 +244,23 @@ class Repository
   end
 
   def contributors
-    contributors = {}
     log = graph_log.group_by { |i| i[:author_email] }
 
-    log.each do |email, contributions|
-      contributors[email] = {
-        email: email,
-        commits: 0,
-        additions: 0,
-        deletions: 0,
-      }
+    log.map do |email, contributions|
+      contributor = Gitlab::Contributor.new
+      contributor.email = email
 
       contributions.each do |contribution|
-        if contributors[email][:name].blank?
-          contributors[email][:name] = contribution[:author_name]
+        if contributor.name.blank?
+          contributor.name = contribution[:author_name]
         end
 
-        contributors[email][:commits] += 1
-        contributors[email][:additions] += contribution[:additions] || 0
-        contributors[email][:deletions] += contribution[:deletions] || 0
+        contributor.commits += 1
+        contributor.additions += contribution[:additions] || 0
+        contributor.deletions += contribution[:deletions] || 0
       end
-    end
 
-    contributors.values
+      contributor
+    end
   end
 end
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b190646a1e3..09fb97abf29 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -218,5 +218,9 @@ module API
 
       expose :same, as: :compare_same_ref
     end
+
+    class Contributor < Grape::Entity
+      expose :name, :email, :commits, :additions, :deletions
+    end
   end
 end
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 241036729b5..d091fa4f035 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -160,7 +160,7 @@ module API
       get ':id/repository/contributors' do
         authorize! :download_code, user_project
 
-        user_project.repository.contributors
+        present user_project.repository.contributors, with: Entities::Contributor
       end
     end
   end
diff --git a/lib/gitlab/contributors.rb b/lib/gitlab/contributors.rb
index 834532470aa..c41e92b620f 100644
--- a/lib/gitlab/contributors.rb
+++ b/lib/gitlab/contributors.rb
@@ -3,7 +3,7 @@ module Gitlab
     attr_accessor :email, :name, :commits, :additions, :deletions
 
     def initialize
-
+      @commits, @additions, @deletions = 0, 0, 0
     end
   end
 end