diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/repositories_controller.rb | 19 | ||||
| -rw-r--r-- | app/models/repository.rb | 23 |
2 files changed, 33 insertions, 9 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index bdd56f0aa..59afc5529 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -397,16 +397,16 @@ class RepositoriesController < ApplicationController end def graph_commits_per_author(repository) - commits_by_author = Changeset.where("repository_id = ?", repository.id).group(:committer).count - commits_by_author.to_a.sort! {|x, y| x.last <=> y.last} - - changes_by_author = Change.joins(:changeset).where("#{Changeset.table_name}.repository_id = ?", repository.id).group(:committer).count - h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o} - - fields = commits_by_author.collect {|r| r.first} - commits_data = commits_by_author.collect {|r| r.last} - changes_data = commits_by_author.collect {|r| h[r.first] || 0} + #data + stats = repository.stats_by_author + fields, commits_data, changes_data = [], [], [] + stats.each do |name, hsh| + fields << name + commits_data << hsh[:commits_count] + changes_data << hsh[:changes_count] + end + #expand to 10 values if needed fields = fields + [""]*(10 - fields.length) if fields.length<10 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10 @@ -414,6 +414,7 @@ class RepositoriesController < ApplicationController # Remove email address in usernames fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') } + #prepare graph graph = SVG::Graph::BarHorizontal.new( :height => 30 * commits_data.length, :width => 800, diff --git a/app/models/repository.rb b/app/models/repository.rb index 1b469c0cc..3e5174d2a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -405,6 +405,29 @@ class Repository < ActiveRecord::Base new_record? && project && Repository.where(:project_id => project.id).empty? end + # Returns a hash with statistics by author in the following form: + # { + # "John Smith" => { :commits => 45, :changes => 324 }, + # "Bob" => { ... } + # } + # + # Notes: + # - this hash honnors the users mapping defined for the repository + def stats_by_author + commits_by_author = Changeset.where("repository_id = ?", id).group(:committer).count + commits_by_author.to_a.sort! {|x, y| x.last <=> y.last} + + changes_by_author = Change.joins(:changeset).where("#{Changeset.table_name}.repository_id = ?", id).group(:committer).count + h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o} + + commits_by_author.inject({}) do |hash, (name, commits_count)| + hash[name] = {} + hash[name][:commits_count] = commits_count + hash[name][:changes_count] = h[name] || 0 + hash + end + end + protected def check_default |