hubstats 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0023871019f4e8751aca49c3caf7f00d02df2496
-  data.tar.gz: e34134e192ae8a3ac9db367ae1984781cab6774b
+  metadata.gz: 537f94c651e1ab391a44870a9cb81a6a1d5dda01
+  data.tar.gz: 95c9ad450b14a38ef5273f8517084223bd2bcec0
 SHA512:
-  metadata.gz: b817595398b3d27fb7cf6f79af231fc46296f06cd10c03000addd655715bb68c5d99dc3967ab3410fedb24ca42d84864c0604e1a840ddee5e1ae7eb616208afa
-  data.tar.gz: e7bcab693326c6ee83437a3e9705548f89d556af3fb28ee140e755eab56b95042df1feb77294f144a1ea4723036fd41262cfec90ef3ecb784440ca50f84fad68
+  metadata.gz: 5250264e9388e49cb1d8b0a1c11da9df645a4cccb79edea71507c08d615537ad9d82275bc704b1020e01f253a4f8306bc5d84a29eaac3cec0344120906a1fec9
+  data.tar.gz: 1e17e63ba54907c3d692683d10c95b0148d3470b7b48bba7ab464d7a38cd0782744e4e2a8e5d9d5160b09bbfcca2bdec404546507275d09518121276adaac8f5

data/CHANGELOG.markdown

@@ -1,3 +1,16 @@
+#### v0.5.2
+* Change deployments count to comments count on user condensed page
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/79
+
+* Adding PRs per developer and Comments per reviewer to team page
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/78
+
+* Making the team's user column to be developers/reviewers
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/77
+
 #### v0.5.1
 * adding hubstats; fixing little error in readme
 

data/app/assets/javascripts/hubstats/users.js

@@ -37,14 +37,6 @@ $(document).ready(function() {
   $("#deletions").on("click", function(){
     toggleOrder(queryParameters,$(this).attr('id'));
   });
-
-  $("#repocount").on("click", function(){
-    toggleOrder(queryParameters,$(this).attr('id'));
-  });
-
-  $("#usercount").on("click", function(){
-    toggleOrder(queryParameters,$(this).attr('id'));
-  });
 });
 
 /* toggleOrder

data/app/controllers/hubstats/teams_controller.rb

@@ -14,7 +14,7 @@ module Hubstats
       else
         @teams = Hubstats::Team.where(hubstats: true).with_all_metrics(@start_date, @end_date)
           .with_id(params[:teams])
-          .custom_order(params[:order])
+          .order_by_name
           .paginate(:page => params[:page], :per_page => 15)
       end
 
@@ -35,6 +35,9 @@ module Hubstats
       @users = @team.users.where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).order("login ASC")
       @user_count = @users.length
       @comment_count = Hubstats::Comment.belonging_to_team(@users.pluck(:id)).created_in_date_range(@start_date, @end_date).count(:all)
+      repos_pr = @pull_requests.pluck(:repo_id)
+      repos_comment = Hubstats::Comment.where("user_id IN (?)", @users).pluck(:repo_id)
+      @repo_count = repos_pr.concat(repos_comment).uniq.count
       @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).sum(:additions).to_i -
                        Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).sum(:deletions).to_i
       @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).average(:additions)
@@ -53,6 +56,9 @@ module Hubstats
         pull_count: @pull_count,
         user_count: @user_count,
         comment_count: @comment_count,
+        repo_count: @repo_count
+      }
+      @stats_additions = {
         avg_additions: @additions.round.to_i,
         avg_deletions: @deletions.round.to_i,
         net_additions: @net_additions

data/app/models/hubstats/pull_request.rb

@@ -80,6 +80,7 @@ module Hubstats
     def self.update_teams_in_pulls(days)
       pulls = created_since(days)
       pulls.each {|pull| pull.assign_team_from_user}
+      puts "Finished updating the teams of past pull requests"
     end
 
     # Public - Filters all of the pull requests between start_date and end_date that are the given state

data/app/models/hubstats/team.rb

@@ -3,20 +3,6 @@ module Hubstats
 
     scope :with_id, lambda {|team_id| where(id: team_id.split(',')) if team_id}
 
-    # Public - Counts all of the users that are a part of the selected team.
-    #
-    # start_date - the start of the date range
-    # end_date - the end of the date range
-    #
-    # Returns - the count of users
-    scope :users_count, lambda {|start_date, end_date|
-      select("hubstats_teams.id as team_id")
-       .select("COUNT(DISTINCT hubstats_teams_users.user_id) AS user_count")
-       .where("hubstats_users.login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"])
-       .joins(:users)
-       .group("hubstats_teams.id")
-    }
-
     # Public - Counts all of the comments a selected team's members have written that occurred between the start_date and end_date.
     # 
     # start_date - the start of the date range
@@ -31,19 +17,6 @@ module Hubstats
        .group("hubstats_teams.id")
     }
 
-    # Public - Counts all of the repos a selected team's members have made PRs or comments on.
-    # 
-    # start_date - the start of the date range
-    # end_date - the end of the data range
-    # 
-    # Returns - count of repos
-    scope :repos_count, lambda {|start_date, end_date|
-      select("hubstats_teams.id as team_id")
-       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.repo_id),0) AS repo_count")
-       .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.team_id = hubstats_teams.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
-       .group("hubstats_teams.id")
-    }
-
     # Public - Counts all of the merged pull requests for selected team's users that occurred between the start_date and end_date.
     # 
     # start_date - the start of the date range
@@ -57,34 +30,16 @@ module Hubstats
       .group("hubstats_teams.id")
     }
 
-    # Public - Counts all of the addtiions and deletions made from PRs by a member of the selected team that have been merged between the start_date
-    # and the end_date.
-    #
-    # start_date - the start of the date range
-    # end_date - the end of the data range
-    #
-    # Returns - the additions and deletions
-    scope :net_additions_count, lambda {|start_date, end_date|
-      select("hubstats_teams.id as team_id")
-      .select("SUM(IFNULL(hubstats_pull_requests.additions, 0)) AS additions")
-      .select("SUM(IFNULL(hubstats_pull_requests.deletions, 0)) AS deletions")
-      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.team_id = hubstats_teams.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
-      .group("hubstats_teams.id")
-    }
-
-    # Public - Joins all of the metrics together for selected team: net additions, comments, repos, pull requests, and users.
+    # Public - Joins all of the metrics together for selected team: net additions, comments, repos, and pull requests.
     # 
     # start_date - the start of the date range
     # end_date - the end of the data range
     # 
     # Returns - all of the stats about the team
     scope :with_all_metrics, lambda {|start_date, end_date|
-      select("hubstats_teams.*, user_count, pull_request_count, comment_count, repo_count,additions, deletions")
-       .joins("LEFT JOIN (#{net_additions_count(start_date, end_date).to_sql}) AS net_additions ON net_additions.team_id = hubstats_teams.id")
+      select("hubstats_teams.*, pull_request_count, comment_count")
        .joins("LEFT JOIN (#{pull_requests_count(start_date, end_date).to_sql}) AS pull_requests ON pull_requests.team_id = hubstats_teams.id")
        .joins("LEFT JOIN (#{comments_count(start_date, end_date).to_sql}) AS comments ON comments.team_id = hubstats_teams.id")
-       .joins("LEFT JOIN (#{repos_count(start_date, end_date).to_sql}) AS repos ON repos.team_id = hubstats_teams.id")
-       .joins("LEFT JOIN (#{users_count(start_date, end_date).to_sql}) AS users ON users.team_id = hubstats_teams.id")
        .group("hubstats_teams.id")
     }
 
@@ -126,34 +81,11 @@ module Hubstats
       team.save!
     end
 
-    # Public - Designed so that the list of teams can be ordered based on users, pulls, comments, net additions, or name.
-    # if none of these are selected, then the default is to order by pull request count in descending order.
-    #
-    # order_params - the param of what the teams should be sorted by
+    # Public - Orders the list of data by name (alphabetical)
     #
-    # Returns - the team data ordered
-    def self.custom_order(order_params)
-      if order_params
-        order = order_params.include?('asc') ? "ASC" : "DESC"
-        case order_params.split('-').first
-        when 'usercount'
-          order("user_count #{order}")
-        when 'pulls'
-          order("pull_request_count #{order}")
-        when 'comments'
-          order("comment_count #{order}")
-        when 'netadditions'
-          order("additions - deletions #{order}")
-        when 'repocount'
-          order("repo_count #{order}")
-        when 'name'
-          order("name #{order}")
-        else
-          order("pull_request_count #{order}")
-        end
-      else 
-        order("pull_request_count DESC")
-      end
+    # Returns - the data ordered alphabetically by name
+    def self.order_by_name
+      order("name ASC")
     end
   end
 end

data/app/models/hubstats/user.rb

@@ -4,6 +4,8 @@ module Hubstats
     # Various checks that can be used to filter and find info about users.
     scope :with_id, lambda {|user_id| where(id: user_id.split(',')) if user_id}
     scope :only_active, having("comment_count > 0 OR pull_request_count > 0 OR deploy_count > 0")
+    scope :is_developer, having("pull_request_count > 0")
+    scope :is_reviewer, having("comment_count > 0")
     scope :with_contributions, lambda {|start_date, end_date, repo_id| with_all_metrics_repos(start_date, end_date, repo_id) if repo_id}
 
     # Public - Counts all of the deploys for selected user that occurred between the start_date and end_date.
@@ -205,7 +207,7 @@ module Hubstats
     end
 
     # Public - Designed so that the list of users can be ordered based on deploys, pulls, comments, net additions, or name.
-    # if none of these are selected, then the default is to order by pull request count in descending order.
+    # If none of these are selected, then the default is to order by pull request count in descending order.
     #
     # order_params - the param of what the users should be sorted by
     #
@@ -232,6 +234,28 @@ module Hubstats
       end
     end
 
+    # Public - Counts all of the pull requests for the users and sees if the count of PRs is greater than 0 (if they are a developer).
+    # Then counts all of the developers.
+    #
+    # start_date - the starting date that we want to count the PRs from
+    # end_date - the ending date that we want to count the PRs from
+    #
+    # Returns - the count of total users that have PRs > 0
+    def self.count_active_developers(start_date, end_date)
+      self.pull_requests_count(start_date, end_date).is_developer.to_a.count
+    end
+
+    # Public - Counts all of the comments for the users and sees if the count of comments is greater than 0 (if they are a reviewer).
+    # Then counts all of the reviewers.
+    #
+    # start_date - the starting date that we want to count the comments from
+    # end_date - the ending date that we want to count the comments from
+    #
+    # Returns - the count of total users that have comments > 0
+    def self.count_active_reviewers(start_date, end_date)
+      self.comments_count(start_date, end_date).is_reviewer.to_a.count
+    end
+
     # Public - Gets the first team where the user is belongs to and where hubstats bool is true.
     #
     # Returns - the first team that the user belongs to where hubstats bool is true, if nothing

data/app/views/hubstats/partials/_quick_addition_stats.html.erb

@@ -2,32 +2,32 @@
 <div class="col-lg-<%= (12-(@stats_additions.length)*2)/2 %>"></div>
 
 <% if @stats_additions.has_key? :net_additions %>
-	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats_additions[:net_additions] %> </h1>
-	  <h4> Net Additions </h4>
-	</div>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_additions[:net_additions] %> </h1>
+    <h4> Net Additions </h4>
+  </div>
 <% end %>
 <% if @stats_additions.has_key? :avg_additions %>
-	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats_additions[:avg_additions] %> </h1>
-	  <h4> Average Additions per Pull Request </h4>
-	</div>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_additions[:avg_additions] %> </h1>
+    <h4> Average Additions per Pull Request </h4>
+  </div>
 <% end %>
 <% if @stats_additions.has_key? :avg_deletions%>
-	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1><%= @stats_additions[:avg_deletions] %> </h1>
-	  <h4> Average Deletions per Pull Request </h4>
-	</div>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1><%= @stats_additions[:avg_deletions] %> </h1>
+    <h4> Average Deletions per Pull Request </h4>
+  </div>
 <% end %>
 <% if @stats_additions.has_key? :additions %>
-	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats_additions[:additions] %> </h1>
-	  <h4> Additions </h4>
-	</div>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1> <%= @stats_additions[:additions] %> </h1>
+    <h4> Additions </h4>
+  </div>
 <% end %>
 <% if @stats_additions.has_key? :deletions%>
-	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1><%= @stats_additions[:deletions] %> </h1>
-	  <h4> Deletions </h4>
-	</div>
+  <div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
+    <h1><%= @stats_additions[:deletions] %> </h1>
+    <h4> Deletions </h4>
+  </div>
 <% end %>

data/app/views/hubstats/partials/_quick_stats.html.erb

@@ -2,62 +2,68 @@
 <div class="col-lg-<%= (12-(@stats_basics.length)*2)/2 %>"></div>
 
 <% if @stats_basics.has_key? :user_count %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1> <%= @stats_basics[:user_count] %> </h1>
-	  <h4> Active Users </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_basics[:user_count] %> </h1>
+    <h4> Active Users </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :deploy_count %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1> <%= @stats_basics[:deploy_count] %> </h1>
-	  <h4> Deployments </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_basics[:deploy_count] %> </h1>
+    <h4> Deployments </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :pull_count %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1> <%= @stats_basics[:pull_count] %> </h1>
-	  <h4> Merged Pull Requests </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_basics[:pull_count] %> </h1>
+    <h4> Merged Pull Requests </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :comment_count %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1><%= @stats_basics[:comment_count] %> </h1>
-	  <h4> Comments </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_basics[:comment_count] %> </h1>
+    <h4> Comments </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :review_count %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	   <h1> <%= @stats_basics[:review_count] %> </h1>
-	  <h4> Code Reviews </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+     <h1> <%= @stats_basics[:review_count] %> </h1>
+    <h4> Code Reviews </h4>
+  </div>
+<% end %>
+<% if @stats_basics.has_key? :repo_count %>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+     <h1> <%= @stats_basics[:repo_count] %> </h1>
+    <h4> Repositories with Pull Requests or Comments </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :net_additions %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1> <%= @stats_basics[:net_additions] %> </h1>
-	  <h4> Net Additions </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_basics[:net_additions] %> </h1>
+    <h4> Net Additions </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :avg_additions %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1> <%= @stats_basics[:avg_additions] %> </h1>
-	  <h4> Average Additions per Pull Request </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_basics[:avg_additions] %> </h1>
+    <h4> Average Additions per Pull Request </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :avg_deletions%>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1><%= @stats_basics[:avg_deletions] %> </h1>
-	  <h4> Average Deletions per Pull Request </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_basics[:avg_deletions] %> </h1>
+    <h4> Average Deletions per Pull Request </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :additions %>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1> <%= @stats_basics[:additions] %> </h1>
-	  <h4> Additions </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1> <%= @stats_basics[:additions] %> </h1>
+    <h4> Additions </h4>
+  </div>
 <% end %>
 <% if @stats_basics.has_key? :deletions%>
-	<div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
-	  <h1><%= @stats_basics[:deletions] %> </h1>
-	  <h4> Deletions </h4>
-	</div>
+  <div class="col col-lg-2 col-md-3 col-sm-3 col-xs-3 text-center">
+    <h1><%= @stats_basics[:deletions] %> </h1>
+    <h4> Deletions </h4>
+  </div>
 <% end %>

data/app/views/hubstats/partials/_team.html.erb

@@ -11,7 +11,8 @@
   <!-- Show all of the stats for the individual team -->
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= team.user_count || 0 %></span> <!-- minus one for the user we're using as the access_token -->
+      <span class="text-large"><%= team.users.count_active_developers(@start_date, @end_date) %> /
+                               <%= team.users.count_active_reviewers(@start_date, @end_date) %></span>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
@@ -22,19 +23,28 @@
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= team.comment_count %></span>
-      <span class="mega-octicon octicon-comment"></span>
+      <span class="text-large"><% if team.users.count_active_developers(@start_date, @end_date) != 0 %>
+                                 <%= (team.pull_request_count.to_f / team.users.count_active_developers(@start_date, @end_date).to_f).round(2) %>
+                               <% else %>
+                                 <%= 0 %>
+                               <% end %></span>
+      <span class="mega-octicon octicon-git-pull-request"></span>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= team.repo_count %></span>
-      <span class="mega-octicon octicon-repo"></span>
+      <span class="text-large"><%= team.comment_count %></span>
+      <span class="mega-octicon octicon-comment"></span>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= team.additions - team.deletions %></span>
+      <span class="text-large"><% if team.users.count_active_reviewers(@start_date, @end_date) != 0 %>
+                                 <%= (team.comment_count.to_f / team.users.count_active_reviewers(@start_date, @end_date).to_f).round(2) %>
+                               <% else %>
+                                 <%= 0 %>
+                               <% end %></span>
+      <span class="mega-octicon octicon-comment"></span>
     </div>
   </div>
 </div>

data/app/views/hubstats/partials/_user-condensed.html.erb

@@ -20,8 +20,8 @@
   </div>
   <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
     <div class="pull-right">
-      <span class="text-large"><%= Hubstats::Deploy.belonging_to_user(user.id).deployed_in_date_range(@start_date, @end_date).count(:all) %></span>
-      <span class="mega-octicon octicon-rocket"></span>
+      <span class="text-large"><%= Hubstats::Comment.belonging_to_user(user.id).created_in_date_range(@start_date, @end_date).count(:all) %></span>
+      <span class="mega-octicon octicon-comment"></span>
     </div>
   </div>
   <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">

data/app/views/hubstats/tables/_teams.html.erb

@@ -3,22 +3,22 @@
   <div class="teams">
     <div class="row single-user header">
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="name"> Team Name <span class="octicon"></span> </a>
+        <a class="header desc"> Team Name <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="usercount"> Users <span class="octicon"></span> </a>
+        <a class="header desc"> Developers / Reviewers <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="pulls"> Merged Pull Requests <span class="octicon"></span> </a>
+        <a class="header desc"> Merged Pull Requests <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="comments"> Comments <span class="octicon"></span></a>
+        <a class="header desc"> Pull Requests per Developer <span class="octicon"></span></a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="repocount"> Repositories <span class="octicon"></span></a>
+        <a class="header desc"> Comments <span class="octicon"></span></a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="netadditions"> Net Additions <span class="octicon"></span></a>
+        <a class="header desc"> Comments per Reviewer <span class="octicon"></span></a>
       </div>
     </div>
     <%= render partial: 'hubstats/partials/team', collection: @teams, as: :team %>

data/app/views/hubstats/teams/show.html.erb

@@ -5,7 +5,14 @@
     <h1 class="title text-center"><%= @team.name %></a> </h1>
 
     <!-- Show all of the stats about the team -->
-    <%= render 'hubstats/partials/quick_stats' %>
+        <%= render 'hubstats/partials/quick_stats' %>
+    <br>
+    <br>
+    <br>
+    <br>
+    <br>
+    <br>
+    <%= render 'hubstats/partials/quick_addition_stats' %>
   </div>
 
   <div class="row">

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/controllers/hubstats/teams_controller_spec.rb

@@ -10,7 +10,7 @@ module Hubstats
         team2 = create(:team, :name => "Team Two", :hubstats => false)
         team3 = create(:team, :name => "Team Three", :hubstats => true)
         team4 = create(:team, :name => "Team Four", :hubstats => true)
-        expect(Hubstats::Team).to receive_message_chain("with_id.custom_order.paginate").and_return([team1, team2, team3, team4])
+        expect(Hubstats::Team).to receive_message_chain("with_id.order_by_name.paginate").and_return([team4, team1, team3, team2])
         allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
         get :index
         expect(response).to have_http_status(200)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails