hubstats 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzViZjVlOWMwMzRlOTM0YjUyNDgxYmEyZjU1ODA1OTJmZGQzNzQxZg==
+    NzFmMmMxMmUzZGRlZmQ1OTZlNWU0ZmZkMTIxMmQyNDhlNmEzZjc2Nw==
   data.tar.gz: !binary |-
-    NThhMDU0YjJlZWMzOGJhMzM5ZjRjMGRlNTliNTI3MGU4OTcyNDZkOA==
+    ZGI0N2Y1YjUyMDlkYmJiM2FiZDY3M2ZlZGFlMDY4M2IzY2ZhNTVlZQ==
 SHA512:
   metadata.gz: !binary |-
-    NWQ2NTJjMzg4YmE5YTg1YmNiZjlmMGU4OTg4MDJkMjM3NDgwNGIyMWNiZDBk
-    NmM3ZmMxYTk1ZDg0YzI4N2ZhMmRhZGJkODJmMTYzYTU0YjRiNWI0MGEyYzFi
-    Zjg2YzA2OTFhYjcwN2VmN2ZkMmVmZDE0MDQyMjA5OWYyNTI5MmI=
+    ODhkZDEyZWVmZWRmNjUwYTUzMDFkY2IzNjFhNTFmYzAyMTg5NTZkODcwNWJj
+    MzRhOTgyZTI4ZDgxNDk5ZDI5MDQ4ZDRmMGJmZWIwNzdlZjAxODlmODYzNjcy
+    M2QwY2EyY2FlNmY5MTRkNjZiNDVhMzVlN2JmMTMzYjhiN2EzMGY=
   data.tar.gz: !binary |-
-    NjQ3M2FkZWQxNTBmMDIxZjIyY2QzOGNmZGYyMDQ5ZTNkYWM0OGM5YTY3NmY1
-    NTllNzM0MWViMWY3MTk4ZjVkNjJmZWRlMGY1MTQ0M2NiMjNhMjI4YzY5Mzc2
-    M2U4ZGE0MzE1MTBmOTQ1YTI4YTc4NDI2YzM1MTc4MDk3Yzk0MDk=
+    NmRiMjk0NmMxYjY2MTZiMWEwZjllNjliZDk5YjMxZjRkODdhYzRkNWI1ZTE0
+    NzExNjViMzk3OTMyNTZhZDMxMzA2YjVjM2U0MGMyNjQ2NDRkNWU3ZTYwM2Jj
+    MjZjMjc2YjFkZWQwNjU1ZGNjZjllYTI0NDExMjBhYWJjMDg5NzI=

data/CHANGELOG.markdown

@@ -1,3 +1,4 @@
+#### v0.3.5
 #### v0.3.4
 #### v0.3.3
 #### v0.3.3

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

@@ -5,6 +5,10 @@ $(document).ready(function() {
   queryParameters = getUrlVars();
   setUserDefaults(queryParameters);
 
+  $("#deploys").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
+  });
+
   $("#pulls").on("click", function(){
     toggleOrder(queryParameters,$(this).attr('id'));
   });
@@ -47,4 +51,4 @@ function setUserDefaults(queryParameters) {
   else {
     $("#pulls .octicon").addClass('octicon-arrow-down');
   }
-}
+}

data/app/controllers/hubstats/deploys_controller.rb

@@ -5,7 +5,7 @@ module Hubstats
 
     def index
       # sets to include user and repo, and sorts data
-      @deploys = Hubstats::Deploy.includes(:repo).includes(:pull_requests)
+      @deploys = Hubstats::Deploy.includes(:repo, :pull_requests, :user).where("user_id IS NOT NULL")
         .belonging_to_users(params[:users]).belonging_to_repos(params[:repos])
         .group_by(params[:group])
         .order_with_timespan(@timespan, params[:order])
@@ -27,7 +27,7 @@ module Hubstats
       pull_request_count = @pull_requests.length
       net_additions = find_net_additions(@deploy.id)
       comment_count = find_comment_count(@deploy.id)
-      @stats = {
+      @stats_basics = {
         pull_count: pull_request_count,
         net_additions: net_additions,
         comment_count: comment_count
@@ -62,27 +62,40 @@ module Hubstats
 
     # make a new deploy with all of the correct attributes
     def create
-      if params[:deployed_by].nil? || params[:git_revision].nil? || params[:repo_name].nil?
-        render text: "Missing a necessary parameter: deployer, git revision, or repository name.", :status => 400 and return
+      if params[:git_revision].nil? || params[:repo_name].nil? || params[:pull_request_ids].nil?
+        render text: "Missing a necessary parameter: git revision, pull request ids, or repository name.", :status => 400 and return
       else
         @deploy = Deploy.new
         @deploy.deployed_at = params[:deployed_at]
-        @deploy.deployed_by = params[:deployed_by]
         @deploy.git_revision = params[:git_revision]
         @repo = Hubstats::Repo.where(full_name: params[:repo_name])
         
+        # Check before assigning the repository
         if @repo.empty?
           render text: "Repository name is invalid.", :status => 400 and return
         else
           @deploy.repo_id = @repo.first.id.to_i
         end
 
+        # Check before assigning the pull requests
         @pull_request_id_array = params[:pull_request_ids].split(",").map {|i| i.strip.to_i}
-        @deploy.pull_requests = Hubstats::PullRequest.where(repo_id: @deploy.repo_id)
-                                                     .where(number: @pull_request_id_array)
+        if @pull_request_id_array.empty? || @pull_request_id_array == [0]
+          render text: "No pull request ids given.", :status => 400 and return
+        else
+          @deploy.pull_requests = Hubstats::PullRequest.where(repo_id: @deploy.repo_id).where(number: @pull_request_id_array)
+        end
+
+        # Check before assigning the user_id
+        if @deploy.pull_requests.first.nil?
+          render text: "Pull requests not valid", :status => 400 and return
+        else
+          if @deploy.pull_requests.first.merged_by
+            @deploy.user_id = @deploy.pull_requests.first.merged_by
+          end
+        end
 
         if @deploy.save
-          render :nothing =>true, :status => 200 and return
+          render :nothing => true, :status => 200 and return
         else
           render :nothing => true, :status => 400 and return
         end

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -33,7 +33,8 @@ module Hubstats
       @pull_request = Hubstats::PullRequest.belonging_to_repo(@repo.id).where(id: params[:id]).first
       @comments = Hubstats::Comment.belonging_to_pull_request(params[:id]).includes(:user).created_since(@timespan).limit(20)
       @comment_count = Hubstats::Comment.belonging_to_pull_request(params[:id]).includes(:user).created_since(@timespan).count(:all)
-      @stats = {
+      @deploys = Hubstats::Deploy.where(id: @pull_request.deploy_id)
+      @stats_basics = {
         comment_count: @comment_count,
         net_additions: @pull_request.additions.to_i - @pull_request.deletions.to_i
       }

data/app/controllers/hubstats/repos_controller.rb

@@ -21,14 +21,17 @@ module Hubstats
       @repo = Hubstats::Repo.where(name: params[:repo]).first
       @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).updated_since(@timespan).order("updated_at DESC").limit(20)
       @users = Hubstats::User.with_pulls_or_comments(@timespan,@repo.id).only_active.limit(20)
+      @deploys = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_since(@timespan).limit(20)
       @pull_count = Hubstats::PullRequest.belonging_to_repo(@repo.id).updated_since(@timespan).count(:all)
       @deploy_count = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_since(@timespan).count(:all)
       @user_count = Hubstats::User.with_pulls_or_comments(@timespan,@repo.id).only_active.length
-      @stats = {
+      @stats_basics = {
         user_count: @user_count,
         deploy_count: @deploy_count,
         pull_count: @pull_count,
-        comment_count: Hubstats::Comment.belonging_to_repo(@repo.id).created_since(@timespan).count(:all),
+        comment_count: Hubstats::Comment.belonging_to_repo(@repo.id).created_since(@timespan).count(:all)
+      }
+      @stats_additions = {
         avg_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:additions).to_i,
         avg_deletions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:deletions).to_i,
         net_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i -
@@ -37,17 +40,19 @@ module Hubstats
     end
 
     def dashboard
-      @repos = Hubstats::Repo.with_recent_activity(@timespan).limit(20)
-      @users = Hubstats::User.with_pulls_or_comments(@timespan).only_active.limit(20)
-      @repo_count = Hubstats::Repo.with_recent_activity(@timespan).count(:all)
+      @repos = Hubstats::Repo.with_recent_activity(@timespan)
       @user_count = Hubstats::User.with_pulls_or_comments(@timespan).only_active.length
-      @stats = {
+      @stats_basics = {
         user_count: @user_count,
         deploy_count: Hubstats::Deploy.count(:all),
         pull_count: Hubstats::PullRequest.merged_since(@timespan).count(:all),
-        comment_count: Hubstats::Comment.created_since(@timespan).count(:all),
+        comment_count: Hubstats::Comment.created_since(@timespan).count(:all)
+      }
+      @stats_additions = {
         avg_additions: Hubstats::PullRequest.merged_since(@timespan).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).average(:deletions).to_i
+        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).average(:deletions).to_i,
+        net_additions: Hubstats::PullRequest.merged_since(@timespan).sum(:additions).to_i - 
+          Hubstats::PullRequest.merged_since(@timespan).sum(:deletions).to_i
       }
     end
   end

data/app/controllers/hubstats/users_controller.rb

@@ -22,15 +22,14 @@ module Hubstats
       @user = Hubstats::User.where(login: params[:id]).first
       @pull_requests = Hubstats::PullRequest.belonging_to_user(@user.id).updated_since(@timespan).order("updated_at DESC").limit(20)
       @comments = Hubstats::Comment.belonging_to_user(@user.id).created_since(@timespan).order("created_at DESC").limit(20)
-      @review = Hubstats::User.pulls_reviewed_count(@timespan).where(login: params[:id]).first
+      @deploys = Hubstats::Deploy.belonging_to_user(@user.id).deployed_since(@timespan).limit(20)
       @pull_count = Hubstats::PullRequest.belonging_to_user(@user.id).updated_since(@timespan).count(:all)
-      #@deploy_count = Hubstats::Deploy.belonging_to_user(@user.id).deployed_since(@timespan).count(:all)
+      @deploy_count = Hubstats::Deploy.belonging_to_user(@user.id).deployed_since(@timespan).count(:all)
       @comment_count = Hubstats::Comment.belonging_to_user(@user.id).created_since(@timespan).count(:all)
-      @stats = {
+      @stats_basics = {
         pull_count: Hubstats::PullRequest.belonging_to_user(@user.id).merged_since(@timespan).count(:all),
-        #deploy_count: Hubstats::Deploy.belonginging_to_user(@user.id).deployed_since(@timespan).count(:all),
+        deploy_count: @deploy_count,
         comment_count: @comment_count,
-        review_count: @review ? @review.reviews_count : 0,
         avg_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).average(:additions).to_i,
         avg_deletions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).average(:deletions).to_i,
         net_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).sum(:additions).to_i -

data/app/models/hubstats/deploy.rb

@@ -2,7 +2,7 @@ module Hubstats
   class Deploy < ActiveRecord::Base
 
     before_validation :check_time, on: :create
-    validates :git_revision, :deployed_at, :deployed_by, :repo_id, presence: true
+    validates :git_revision, :deployed_at, :repo_id, presence: true
 
     def check_time
         self.deployed_at = Time.now.getutc if deployed_at.nil?
@@ -16,9 +16,9 @@ module Hubstats
     scope :belonging_to_users, lambda {|user_id| where(user_id: user_id.split(',')) if user_id}
     scope :order_with_timespan
     scope :with_repo_name, select('DISTINCT hubstats_repos.name as repo_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_repos ON hubstats_repos.id = hubstats_deploys.repo_id")
-    scope :with_user_name, select('DISTINCT hubstats_deploys.deployed_by as user_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_users ON hubstats_users.id = hubstats_deploys.user_id")
+    scope :with_user_name, select('DISTINCT hubstats_users.login as user_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_users ON hubstats_users.id = hubstats_deploys.user_id")
 
-    attr_accessible :git_revision, :repo_id, :deployed_at, :deployed_by, :user_id, :pull_request_ids
+    attr_accessible :git_revision, :repo_id, :deployed_at, :user_id, :pull_request_ids
 
     belongs_to :user
     belongs_to :repo

data/app/models/hubstats/pull_request.rb

@@ -20,7 +20,7 @@ module Hubstats
       :review_comments_url, :review_comment_url, :comments_url, :statuses_url, :number,
       :state, :title, :body, :created_at, :updated_at, :closed_at, :merged_at, 
       :merge_commit_sha, :merged, :mergeable, :comments, :commits, :additions,
-      :deletions, :changed_files, :user_id, :repo_id
+      :deletions, :changed_files, :user_id, :repo_id, :merged_by
 
     belongs_to :user
     belongs_to :repo
@@ -40,6 +40,17 @@ module Hubstats
       pull_data = github_pull.slice(*column_names.map(&:to_sym))
 
       pull = where(:id => pull_data[:id]).first_or_create(pull_data)
+
+      # Updates the merged_by part of the pull request and the user_id of the deploy
+      if github_pull[:merged_by] && github_pull[:merged_by][:id]
+        pull_data[:merged_by] = github_pull[:merged_by][:id]
+        deploy = Hubstats::Deploy.where(id: pull.deploy_id, user_id: nil).first
+          if deploy
+            deploy.user_id = pull_data[:merged_by]
+            deploy.save!
+          end
+      end
+
       return pull if pull.update_attributes(pull_data)
       Rails.logger.warn pull.errors.inspect
     end

data/app/models/hubstats/repo.rb

@@ -12,6 +12,7 @@ module Hubstats
       :pushed_at, :created_at, :updated_at, :owner_id
 
     has_many :pull_requests
+    has_many :deploys
     belongs_to :owner, :class_name => "User", :foreign_key => "id"
 
     def self.create_or_update(github_repo)

data/app/models/hubstats/user.rb

@@ -15,6 +15,12 @@ module Hubstats
       .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.created_at > '#{time}' AND hubstats_pull_requests.repo_id = '#{repo_id}' AND hubstats_pull_requests.merged = '1'")
       .group("hubstats_users.id")
     }
+    scope :deploys_count, lambda { |time|
+      select("hubstats_users.id as user_id")
+      .select("IFNULL(COUNT(DISTINCT hubstats_deploys.id),0) AS deploy_count")
+      .joins("LEFT JOIN hubstats_deploys ON hubstats_deploys.user_id = hubstats_users.id AND hubstats_deploys.deployed_at > '#{time}'")
+      .group("hubstats_users.id")
+    }
     scope :comments_count, lambda { |time|
       select("hubstats_users.id as user_id")
       .select("COUNT(DISTINCT hubstats_comments.id) AS comment_count")
@@ -59,10 +65,11 @@ module Hubstats
     }
 
     scope :with_all_metrics, lambda { |time|
-      select("hubstats_users.*, pull_request_count, comment_count, average_additions, average_deletions")
+      select("hubstats_users.*, deploy_count, pull_request_count, comment_count, average_additions, average_deletions")
       .joins("LEFT JOIN (#{averages(time).to_sql}) AS averages ON averages.user_id = hubstats_users.id")
       .joins("LEFT JOIN (#{pull_requests_count(time).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
       .joins("LEFT JOIN (#{comments_count(time).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{deploys_count(time).to_sql}) AS deploys ON deploys.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
 
@@ -78,6 +85,7 @@ module Hubstats
     has_many :comments
     has_many :repos, :class_name => "Repo"
     has_many :pull_requests
+    has_many :deploys
 
     def self.create_or_update(github_user)
       github_user[:role] = github_user.delete :type  ##changing :type in to :role
@@ -102,6 +110,8 @@ module Hubstats
       if order_params
         order = order_params.include?('asc') ? "ASC" : "DESC"
         case order_params.split('-').first
+        when 'deploys'
+          order("deploy_count #{order}")
         when 'pulls'
           order("pull_request_count #{order}")
         when 'comments'

data/app/views/hubstats/deploys/index.html.erb

@@ -2,7 +2,7 @@
   <div class="row" %>
     <div class="col col-lg-3 col-md-3 col-sm-3">
 
-    <!--This div is the two controls on the top left, one is for repos and one is for users-->
+    <!-- Allow for filtering by repository or user -->
       <div class="form-group">
         <input class="select2-control" id="repos">
         </input>
@@ -14,7 +14,7 @@
     </div>
 
     <div class="col col-lg-9 col-md-9 col-sm-9">
-      <!--The below div is for the different buttons that control the sorting of what deploys users want to view-->
+      <!-- Allow viewing deploys by newest first or oldest first -->
       <div id="sort-group" class="btn-group" data-toggle="buttons">
         <label class="btn btn-default" id="desc">
           <input type="radio" name="sort"> Newest
@@ -24,14 +24,14 @@
         </label>
       </div>
 
-      <!--The following div is for the group by drop down menu on the top right (but not the timespan one)-->
+      <!-- Allow to group by repository and user -->
       <select id="group-by" class="form-control pull-right" style="width: 100px; display: inline; ">
         <option value="">Group By</option>
         <option value="user">User</option>
         <option value="repo">Repo</option>
       </select>
 
-      <!--Shows all of the deploys-->
+      <!-- Show all of the deploys -->
       <%= render 'hubstats/tables/grouped_deploys' %>
 
       <!--Contains the pagination so that only 15 deploys show per page-->

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

@@ -5,6 +5,10 @@
       <%= link_to @deploy.repo.name.titleize, repo_path(@deploy.repo.name) %> /
       <%= @deploy.git_revision.titleize %>
     </h1>
+    <br>
+    <h4 class="text-center">
+      Deployed at: <%= @deploy.deployed_at %>
+    </h4>
     <!--Show the number of pull requests, comments, and net additions-->
     <%= render "hubstats/partials/quick_stats" %>
   </div>

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

@@ -1,14 +1,19 @@
 <div class="row single-deploy">
+  <div class="user-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
+    <img src= <%= deploy.user.avatar_url%> alt= <%= deploy.user.login %> >
+  </div>
   
-  <div class="deploy-info col-lg-9 col-md-9 col-sm-9 col-xs-8">
+  <!-- Show the git revision and when the deploy happened by whom -->
+  <div class="deploy-info col-lg-6 col-md-6 col-sm-6 col-xs-5">
     <h4>
-      <%= deploy.git_revision %> 
+      <%= link_to deploy.git_revision, deploy_path(deploy) %> 
     </h4>
-    by <%= link_to deploy.deployed_by, user_path(deploy.deployed_by) %>
+    by <%= link_to deploy.user.login, user_path(deploy.user) %>
     <%= "#{time_ago_in_words(deploy.deployed_at)} ago "%>
   </div>
 
-  <div class="col-lg-2 col-md-2 col-sm-2">
+  <!-- Show all of the pull requests linked to the github PR -->
+  <div class="col-lg-5 col-md-5 col-sm-5">
     <div class="deploy-right">
       <% deploy.pull_requests.each_with_index do |pull_request, index| %>
         <% if index == deploy.pull_requests.size - 1 %>

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

@@ -1,22 +1,22 @@
 <div class="row single-deploy">
 
   <div class="user-image col-lg-1 col-md-1 col-sm-1" >
-    <!-- <img src= <%= deploy.deployed_by %> alt= <%= deploy.deployed_by%> > -->
+     <img src= <%= deploy.user.avatar_url %> alt= <%= deploy.user.login %> >
   </div>
 
-  <!--Show the repo name, git revision, and who deployed it when-->
+  <!-- Show the repo name, git revision, and who deployed it when  -->
   <div class="deploy-info col-lg-6 col-md-7 col-sm-6">
     <h4> 
       <%= link_to deploy.repo.name, repo_path(deploy.repo.name) %> /
       <%= link_to deploy.git_revision, deploy_path(deploy) %>
     </h4>
-    <br> <!--should route to the user/id path-->
-    by <%= link_to deploy.deployed_by, user_path(deploy.deployed_by) %>
+    <br>
+    by <%= link_to deploy.user.login, user_path(deploy.user) %>
     <%= "#{time_ago_in_words(deploy.deployed_at)} ago "%>
     <br>
   </div>
 
-  <!--Show a list of links with all the pull requests in the deploy-->
+  <!-- Show a list of links with all the pull requests in the deploy -->
   <div class="col-lg-5 col-md-5 col-sm-5">
     <div class="deploy-right">
       <% deploy.pull_requests.each_with_index do |pull_request, index| %>

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

@@ -0,0 +1,19 @@
+<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>
+<% 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 </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 </h4>
+	</div>
+<% end %>

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

@@ -1,49 +1,50 @@
-<div class="col-lg-<%= (12-(@stats.length)*2)/2 %>"></div>
-<% if @stats.has_key? :user_count %>
+<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-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats[:user_count] %> </h1>
+	  <h1> <%= @stats_basics[:user_count] %> </h1>
 	  <h4> Active Users </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :deploy_count %>
+<% if @stats_basics.has_key? :deploy_count %>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats[:deploy_count] %> </h1>
+	  <h1> <%= @stats_basics[:deploy_count] %> </h1>
 	  <h4> Deploys </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :pull_count %>
+<% if @stats_basics.has_key? :pull_count %>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats[:pull_count] %> </h1>
+	  <h1> <%= @stats_basics[:pull_count] %> </h1>
 	  <h4> Pull Requests </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :comment_count %>
+<% if @stats_basics.has_key? :comment_count %>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1><%= @stats[:comment_count] %> </h1>
+	  <h1><%= @stats_basics[:comment_count] %> </h1>
 	  <h4> Comments </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :review_count %>
+<% if @stats_basics.has_key? :review_count %>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats[:review_count] %> </h1>
+	   <h1> <%= @stats_basics[:review_count] %> </h1>
 	  <h4> Code Reviews </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :net_additions %>
+<% if @stats_basics.has_key? :net_additions %>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats[:net_additions] %> </h1>
+	  <h1> <%= @stats_basics[:net_additions] %> </h1>
 	  <h4> Net Additions </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :avg_additions %>
+<% if @stats_basics.has_key? :avg_additions %>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1> <%= @stats[:avg_additions] %> </h1>
+	  <h1> <%= @stats_basics[:avg_additions] %> </h1>
 	  <h4> Average Additions </h4>
 	</div>
 <% end %>
-<% if @stats.has_key? :avg_deletions%>
+<% if @stats_basics.has_key? :avg_deletions%>
 	<div class="col col-lg-2 col-md-4 col-sm-4 col-xs-4 text-center">
-	  <h1><%= @stats[:avg_deletions] %> </h1>
+	  <h1><%= @stats_basics[:avg_deletions] %> </h1>
 	  <h4> Average Deletions </h4>
 	</div>
-<% end %>
+	<% end %>