hubstats 0.0.21 → 0.0.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2JhNzMwNDg0MmYwM2RjNjczYmMyOTY0YTBiMjI2YjY5NDE4OGZiOQ==
+    ZGJjMGNlNWFiMzEyZjE0Zjk2MGRlNTJmNGQzM2JjY2QxOTYxY2NhYw==
   data.tar.gz: !binary |-
-    ZGQwNjg0Yjc4Nzk0MDQwMWI5ZjViODBjZmYxNjRmMTIwMDlhNGE3Nw==
+    NGFjNTQzNjgzMjM2ZDQ4MzBmZTM1ZDZhMjg0Y2ZhNDQxMDZmOGQ5Zg==
 SHA512:
   metadata.gz: !binary |-
-    MDNiOGY2YzM5ZjM0MmUzNTllNDI4Zjk0YTQ4NDc4ZjQzMzAwM2FiYjFlMDE1
-    OWQwMTExOWZjNTI1ZDAzNTkyNGM1NjE1MTBiMWI0ZDZlMWQ2ZGQxZjM5MmQ5
-    YTI4OTJiODc2NWRmMTg3NDA3ODhjMDMwMmRjMjhiMTEwNjU0NDE=
+    ODVkOWJiZDczNmUzODAzNjBmZWFmNjc2YmNiODJmNzM0MmZlYjg3Y2JhMzk2
+    OWY0MmYxMTZlNmUyZGNmMWYxNTkzMzM4MTJkMDM1N2EzMjhhODVmOTE1NTc4
+    YmNhZGJjMzE4NjVlNDJhOWM4ZDNlYjNiZjUxNTRjMWI4NmJlYjk=
   data.tar.gz: !binary |-
-    M2YxNWRjYWIwNDk4YTg4NGFkY2I0YjYzZjEyZDc5NDAxZTRjMmU3NjRmY2Ji
-    Yjg4ZWU2MGU5NGZmZWViOWQ3N2IyMzI1MjRhZDk5NjE3MDUwNjE1MDg4Mjdi
-    NDkwZWNlMmIwZTdiZmE0NTQxOWM3YWZlMWQ0NTk0MDAzMjk1MmI=
+    YWUwYzIzMjRmMmVlMjYwYjU4MjFhNmZhZTdkMmVlYjg5ZTA1YWIyNDBkM2Mw
+    ZmJiOTdmOTI5NDFhMjYyYWUyMzc0NWQ2YmY5M2YzMTAxNGNiODgxYzliMzQw
+    ZGRmNGEzZmM2MmJlYzg2NmI4MGI2ZGY4ZjdlOTdjODI3ZDRlMjU=

data/README.rdoc

@@ -31,6 +31,4 @@ Hubstats needs to know what repos for it to watch. You can set it to watch eithe
   rake hubstats:setup
   Add 'mount Hubstats::Engine => "/hubstats"' to your routes file
 
-This project rocks and uses MIT-LICENSE.
-
-Sport Ngin
+This project rocks and uses MIT-LICENSE.

data/app/assets/stylesheets/hubstats/application.css

@@ -31,53 +31,79 @@
 .text-large {
   font-size: 32px;
 }
+
+.text-small {
+  font-size: 12px;
+  margin: 0px;
+}
 .stat-label {
   display: inline-block;
 }
 
 .single-comment > .user-image, 
+.single-comment > .user-image-small,
 .single-pull > .user-image, 
+.single-pull > .user-image-small,
 .single-user > .user-image,
 .single-user > .user-image-small {
   padding: 5px;
 }
 
-.user-image > img{
+
+.user-image > img,
+.repo-image {
   width: 55px;
   height: 55px;
 }
 
-.user-image-small > img{
-  width: 45px;
-  height: 45px;
+.repo-octicon-small {
+  font-size: 36px !important;
+}
+
+.repo-image-small {
+  padding: 5px !important;
+}
+
+.user-image-small > img,
+.repo-image-small > .repo-octicon-small{
+  width: 36px;
+  height: 36px;
 }
 
-.pulls, .comments, .users {
+.pulls, .comments, .users, .repos {
   margin: 15px 0px 15px 0px;
   border: 1px solid #ccc;
   border-radius: 5px;
 }
 
-.pulls > .col, .comments > .col, .users > .col{
+.pulls > .col, .comments > .col, .users > .col, .repos > .col{
   padding: 0px 5px 0px 5px;
 }
 
-.row .single-pull, .row .single-comment, .row .single-user{
+.row .single-pull,
+.row .single-comment,
+.row .single-user,
+.row .single-repo {
   padding:5px;
   margin: 0px;
   border-bottom: 1px solid #ccc;
 }
 
 .comment-info > .well {
+  word-wrap: break-word;
   padding: 10px;
   margin-bottom: 5px;
 }
 
-.single-pull > .pull-info, .single-user > .user-info {
+.single-pull > .pull-info,
+.single-user > .user-info,
+.single-repo > .repo-info {
   padding: 0px;
 }
 
-.pull-info > h4, .user-info > h4 {
+.pull-info > h4,
+.user-info > h4,
+.repo-info > h4 {
   margin: 0px;
 }
 

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -21,20 +21,13 @@ module Hubstats
         .paginate(:page => params[:page], :per_page => 15)
     end 
 
-    def repo_index
-      @repo = Hubstats::Repo.where(name: params[:repo]).first
-      @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).closed_since(@timespan).order("closed_at DESC")
-    end
-
     def show
       @repo = Hubstats::Repo.where(name: params[:repo]).first
       @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)
+      @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 = {
-        github: @pull_request.html_url,
-        comment_count: @comments.count(:all),
-        additions: @pull_request.additions.to_i,
-        deletions: @pull_request.deletions.to_i,
+        comment_count: @comment_count,
         net_additions: @pull_request.additions.to_i - @pull_request.deletions.to_i
       }
     end

data/app/controllers/hubstats/repos_controller.rb

@@ -20,15 +20,17 @@ module Hubstats
 
     def show
       @repo = Hubstats::Repo.where(name: params[:repo]).first
-      @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).closed_since(@timespan).order("closed_at DESC").limit(20)
-      @users = Hubstats::User.with_pulls_or_comments(@timespan,@repo.id).only_active
+      @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)
+      @pull_count = Hubstats::PullRequest.belonging_to_repo(@repo.id).updated_since(@timespan).count(:all)
+      @user_count = Hubstats::User.with_pulls_or_comments(@timespan,@repo.id).only_active.length
       @stats = {
-        user_count: @users.length,
-        pull_count: Hubstats::PullRequest.belonging_to_repo(@repo.id).closed_since(@timespan).count(:all),
+        user_count: @user_count,
+        pull_count: @pull_count,
         comment_count: Hubstats::Comment.belonging_to_repo(@repo.id).created_since(@timespan).count(:all),
-        avg_additions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_repo(@repo.id).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_repo(@repo.id).average(:deletions).to_i,
-        net_additions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i - Hubstats::PullRequest.closed_since(@timespan).belonging_to_repo(@repo.id).sum(:deletions).to_i
+        avg_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).average(:deletions).to_i,
+        net_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i - Hubstats::PullRequest.updated_since(@timespan).belonging_to_repo(@repo.id).sum(:deletions).to_i
       }
     end
 
@@ -39,10 +41,10 @@ module Hubstats
       @user_count = Hubstats::User.with_pulls_or_comments(@timespan).only_active.length
       @stats = {
         user_count: @user_count,
-        pull_count: Hubstats::PullRequest.closed_since(@timespan).count(:all),
+        pull_count: Hubstats::PullRequest.updated_since(@timespan).count(:all),
         comment_count: Hubstats::Comment.created_since(@timespan).count(:all),
-        avg_additions: Hubstats::PullRequest.closed_since(@timespan).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.closed_since(@timespan).average(:deletions).to_i
+        avg_additions: Hubstats::PullRequest.updated_since(@timespan).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.updated_since(@timespan).average(:deletions).to_i
       }
     end
   end

data/app/controllers/hubstats/users_controller.rb

@@ -9,7 +9,7 @@ module Hubstats
       elsif params[:id] ## 
         @users = Hubstats::User.where(id: params[:id].split(",")).order("login ASC")
       else
-        @users = Hubstats::User.with_all_metrics(@timespan).with_id(params[:users]).custom_order(params[:order]).paginate(:page => params[:page], :per_page => 15)
+        @users = Hubstats::User.only_active.with_all_metrics(@timespan).with_id(params[:users]).custom_order(params[:order]).paginate(:page => params[:page], :per_page => 15)
       end
       
       respond_to do |format|
@@ -20,16 +20,18 @@ module Hubstats
 
     def show
       @user = Hubstats::User.where(login: params[:id]).first
-      @pull_requests = Hubstats::PullRequest.belonging_to_user(@user.id).closed_since(@timespan).order("closed_at DESC").limit(20)
+      @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
+      @pull_count = Hubstats::PullRequest.belonging_to_user(@user.id).updated_since(@timespan).count(:all)
+      @comment_count = Hubstats::Comment.belonging_to_user(@user.id).created_since(@timespan).count(:all)
       @stats = {
-        pull_count: Hubstats::PullRequest.belonging_to_user(@user.id).closed_since(@timespan).count(:all),
-        comment_count: Hubstats::Comment.belonging_to_user(@user.id).created_since(@timespan).count(:all),
+        pull_count: @pull_count,
+        comment_count: @comment_count,
         review_count: @review ? @review.reviews_count : 0,
-        avg_additions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_user(@user.id).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_user(@user.id).average(:deletions).to_i,
-        net_additions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_user(@user.id).sum(:additions).to_i - Hubstats::PullRequest.closed_since(@timespan).belonging_to_user(@user.id).sum(:deletions).to_i
+        avg_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).average(:deletions).to_i,
+        net_additions: Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).sum(:additions).to_i - Hubstats::PullRequest.updated_since(@timespan).belonging_to_user(@user.id).sum(:deletions).to_i
       }
     end
 

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

@@ -0,0 +1,22 @@
+<div class="row single-comment">
+  <div class="user-image-small col-lg-1 col-md-1 col-sm-2 col-xs-2">
+    <img src= <%= comment.user.avatar_url%> alt= <%= comment.user.login %> >
+  </div>
+
+  <div class="comment-info col-lg-10 col-md-10 col-sm-8 col-xs-8">
+    <%= link_to comment.user.login, user_path(comment.user) %> commented
+    <%= "#{time_ago_in_words(comment.created_at)} ago "%> <br>
+    <div class="well">
+      <%= comment.body %>
+    </div>
+  </div>
+
+ <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+    <div class="pull-right">
+      <a class="subtle" href=<%= comment.html_url %> > 
+        <span class="octicon octicon-mark-github"></span>
+      </a>
+      </span>
+    </div>
+  </div>
+</div>

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

@@ -3,11 +3,20 @@
     <img src= <%= comment.user.avatar_url%> alt= <%= comment.user.login %> >
   </div>
 
-  <div class="comment-info col-lg-11 col-md-11 col-sm-11">
+  <div class="comment-info col-lg-10 col-md-10 col-sm-10">
     <%= link_to comment.user.login, user_path(comment.user) %> commented
     <%= "#{time_ago_in_words(comment.created_at)} ago "%> <br>
     <div class="well">
       <%= comment.body %>
     </div>
   </div>
+
+ <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+    <div class="pull-right">
+      <a class="subtle" href=<%= comment.html_url %> > 
+        <span class="octicon octicon-mark-github"></span>
+      </a>
+      </span>
+    </div>
+  </div>
 </div>

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

@@ -9,13 +9,13 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand title" href="/hubstats/">Hubstats: Github Metrics</a>
+        <a class="navbar-brand title" href="/">Hubstats</a>
       </div>
 
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav navbar-right">
-          <li><%= link_to "Metrics", root_path%></li>
-          <li><%= link_to "Pulls", pulls_path%></li>
+          <li><%= link_to "Metrics", metrics_path%></li>
+          <li><%= link_to "Pulls", root_path%></li>
           <li><%= link_to "Users", users_path%></li>
           <li>
             <select class="form-control push-down" id="time-select">

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

@@ -0,0 +1,27 @@
+<div class="row single-pull">
+  <div class="user-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
+    <img src= <%= pull.user.avatar_url%> alt= <%= pull.user.login %> >
+  </div>
+
+  <div class="pull-info col-lg-9 col-md-9 col-sm-9 col-xs-8">
+    <h4> 
+      <%= link_to pull.title, repo_pull_path({:repo => pull.repo.name, :id => pull.id}) %> 
+    </h4>
+    by <%= link_to pull.user.login, user_path(pull.user) %>
+    <% if pull.state == 'closed' %>
+      <%= "closed #{time_ago_in_words(pull.closed_at)} ago "%>
+    <% else %>
+      <%= "opened #{time_ago_in_words(pull.created_at)} ago "%>
+    <% end %> 
+  </div>
+
+  <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2" >
+    <div class="pull-right">
+      # <%= pull.number %> 
+      <a class="subtle" href=<%= pull.html_url %> > 
+        <span class="octicon octicon-mark-github"></span>
+      </a>
+      </span>
+    </div>
+  </div>
+</div>

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

@@ -22,7 +22,11 @@
 
   <div class="col-lg-2 col-md-2 col-sm-2" >
     <div class="pull-right">
-      # <%= pull.number %>
+      # <%= pull.number %> 
+      <a class="subtle" href=<%= pull.html_url %> > 
+        <span class="octicon octicon-mark-github"></span>
+      </a>
+      </span>
     </div>
   </div>
 </div>

data/app/views/hubstats/{metrics → partials}/_quick_stats.html.erb

@@ -1,3 +1,4 @@
+<div class="col-lg-<%= (12-(@stats.length)*2)/2 %>"></div>
 <% if @stats.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>

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

@@ -0,0 +1,20 @@
+<div class="row single-repo">
+  <div class="repo-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
+    <span class="repo-octicon-small mega-octicon octicon-repo"></span>
+
+  </div>
+  <div class="repo-info col-lg-10 col-md-10 col-sm-10 col-xs-8">
+    <h4> 
+      <%= link_to repo.name, repo_path(repo)%>
+    </h4>
+    updated <%= distance_of_time_in_words(DateTime.now,repo.updated_at) %> ago
+  </div>
+  <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+    <div class="pull-right">
+      <a class="subtle" href=<%= repo.html_url %> > 
+        <span class="octicon octicon-mark-github"></span>
+      </a>
+      </span>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,30 @@
+<div class="row single-user">
+  <div class="user-image-small col-lg-1 col-md-1 col-sm-1 col-xs-2" >
+    <img src= <%= user.avatar_url%> alt= <%= user.login %> >
+  </div>
+  <div class="user-info col-lg-3 col-md-3 col-sm-3 col-xs-3">
+    <h4> 
+      <%= link_to user.login, user_path(user) %>
+    </h4>
+  </div>
+  <div class="col-lg-3 col-lg-offset-1 col-md-3 col-sm-3 col-xs-3">
+    <div class="pull-right">
+      <span class="text-large"><%= user.pull_request_count %></span>
+      <span class="mega-octicon octicon-git-pull-request"></span>
+    </div>
+  </div>
+  <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
+    <div class="pull-right">
+      <span class="text-large"><%= user.comment_count %></span>
+      <span class="mega-octicon octicon-comment"></span>
+    </div>
+  </div>
+  <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
+    <div class="pull-right">
+      <a class="subtle" href=<%= user.html_url %> > 
+        <span class="octicon octicon-mark-github"></span>
+      </a>
+      </span>
+    </div>
+  </div>
+</div>

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

@@ -15,27 +15,31 @@
     </h4>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="push-down pull-right">
+    <div class="pull-right">
       <span class="text-large"><%= user.pull_request_count %></span>
       <span class="mega-octicon octicon-git-pull-request"></span>
+      <p class="text-small text-center"> pulls </p>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="push-down pull-right">
+    <div class="pull-right">
       <span class="text-large"><%= user.comment_count %></span>
       <span class="mega-octicon octicon-comment"></span>
+      <p class="text-small text-center"> comments </p>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="push-down pull-right">
+    <div class="pull-right">
       <span class="text-large"><%= user.average_additions %></span>
       <span class="mega-octicon octicon-plus"></span>
+      <p class="text-small text-center"> additions </p>
     </div>
   </div>
   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="push-down pull-right">
+    <div class="pull-right">
       <span class="text-large"><%= user.average_deletions %></span>
       <span class="mega-octicon octicon-dash"></span>
+      <p class="text-small text-center"> deletions </p>
     </div>
   </div>
 

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

@@ -47,9 +47,8 @@
         </label>
       </div>
 
-      <div class="pulls">
-        <%= render partial: 'hubstats/partials/pull', collection: @pull_requests, as: :pull %>
-      </div>
+      <%= render 'hubstats/tables/pulls' %>
+  
 
       <div class="text-center">
         <%= will_paginate @posts, renderer: BootstrapPagination::Rails %>

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

@@ -1,11 +1,19 @@
 <div class="container" id="repo">
   <div class="row">
-    <h3> <%= @pull_request.title.titleize %> </h3>
-    <%= render 'hubstats/metrics/quick_stats' %>
+    <h1 class="title text-center">
+      <%= link_to @repo.name.titleize, repo_path %> /
+      <a href=<%=@pull_request.html_url%>>
+        <%= @pull_request.title.titleize %>
+      </a>
+    </h1>
+    <%= render 'hubstats/partials/quick_stats' %>
   </div>
 
-  <div class="col col-lg-7">
-    <%= render 'hubstats/metrics/comments_table' %>
+  <div class="col col-lg-8 col-lg-offset-2">
+    <div class="row">
+      <h4> Comments </h4>
+      <%= render 'hubstats/tables/comments' %>
+    </div>
   </div>
 </div>
 

data/app/views/hubstats/repos/dashboard.html.erb

@@ -1,21 +1,24 @@
 <div class="container" id="splash">
   <div class="row text-center">
-    <%= render 'hubstats/metrics/quick_stats' %>
+    <%= render 'hubstats/partials/quick_stats' %>
   </div>
   <div class="row">
-    <div class="col col-lg-5">
-      <h3> Recently Active Repositories </h3>
-      <%= render 'hubstats/metrics/repos_table' %>
+
+    <div class="col col-lg-6">
+      <h3> Active Repositories </h3>       
+      <%= render 'hubstats/tables/repos' %>
       <% if @repo_count > 20 %>
         <p class="pull-right"><%= link_to "View All", repos_path %></p>
       <% end %>
     </div>
-    <div class="col col-lg-5 col-lg-offset-2">
-      <h3> Most Active Users </h3>
-      <%= render 'hubstats/metrics/users_table' %>
+
+    <div class="col col-lg-6">
+      <h3> Active Users </h3>
+      <%= render 'hubstats/tables/users-condensed' %>
       <% if @user_count > 20 %>
         <p class="pull-right"><%= link_to "View All", users_path %></p>
       <% end %>
     </div>
+    
   </div>
 </div>

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

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col col-lg-5">
       <h3> Recently Active Repositories </h3>
-      <%= render 'hubstats/metrics/repos_table' %>
+      <%= render 'hubstats/table/repos_table' %>
     </div>
   </div>
 </div

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

@@ -1,18 +1,25 @@
 <div class="container" id="repo">
+
   <div class="row">
-    <h1 class="title text-center"> <%= @repo.name.titleize %> </h1>
-    <%= render 'hubstats/metrics/quick_stats' %>
+    <h1 class="title text-center"><a href=<%=@repo.html_url%>> <%= @repo.name.titleize %> </a></h1>
+    <%= render 'hubstats/partials/quick_stats' %>
   </div>
+
   <div class="row">
-    <div class="col col-lg-5">
-      <h3> Pull Requests since <%= time_ago_in_words(@timespan) %> ago</h3>
-       <%= render 'hubstats/metrics/pulls_table' %>
+
+    <div class="col col-lg-6">
+      <h3> Pull Requests</h3>       
+      <%= render 'hubstats/tables/pulls-condensed'%>
+      <% if @pull_count > 20 %>
+        <p class="pull-right"><%= link_to "View All", pulls_path(:repos => @repo.id) %></p>
+      <% end %>
     </div>
-    <div class="col col-lg-5 col-lg-offset-2">
-      <div class="row">
-        <h3> Most Active Users </h3>
-        <%= render 'hubstats/metrics/users_table' %>
-      </div>
+
+    <div class="col col-lg-6">
+      <h3> Active Users </h3>
+      <%= render 'hubstats/tables/users-condensed' %>
     </div>
+
   </div>
+
 </div>

data/app/views/hubstats/tables/_comments-condensed.html.erb

@@ -0,0 +1,7 @@
+<% if @comments.length > 0 %>
+  <div class="comments">
+    <%= render partial: 'hubstats/partials/comment-condensed', collection: @comments, as: :comment %>
+  </div>
+<% else %>
+  <p> No comments to show </p>
+<% end %>

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

@@ -0,0 +1,7 @@
+<% if @comments.length > 0 %>
+  <div class="comments">
+    <%= render partial: 'hubstats/partials/comment', collection: @comments, as: :comment %>
+  </div>
+<% else %>
+  <p> No comments to show </p>
+<% end %>

data/app/views/hubstats/tables/_pulls-condensed.html.erb

@@ -0,0 +1,8 @@
+<% if @pull_requests.length > 0 %>
+  <div class="pulls">
+    <%= render partial: 'hubstats/partials/pull-condensed', collection: @pull_requests, as: :pull %>
+  </div>
+<% else %>
+  <p> No pull requests to show </p>
+<% end %>
+

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

@@ -0,0 +1,8 @@
+<% if @pull_requests.length > 0 %>
+  <div class="pulls">
+    <%= render partial: 'hubstats/partials/pull', collection: @pull_requests, as: :pull %>
+  </div>
+<% else %>
+  <p> No pull requests to show </p>
+<% end %>
+

data/app/views/hubstats/tables/_repos-condensed.html.erb

@@ -0,0 +1,8 @@
+<% if @repos.length > 0 %>
+  <div class="repos">
+    <%= render partial: 'hubstats/partials/repo-condensed', collection: @repos, as: :repo %>
+  </div>
+<% else %>
+  <p> No repos to show </p>
+<% end %>
+

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

@@ -0,0 +1,8 @@
+<% if @repos.length > 0 %>
+  <div class="repos">
+    <%= render partial: 'hubstats/partials/repo', collection: @repos, as: :repo %>
+  </div>
+<% else %>
+  <p> No repos to show </p>
+<% end %>
+

data/app/views/hubstats/tables/_users-condensed.html.erb

@@ -0,0 +1,7 @@
+<% if @users.length > 0 %>
+  <div class="users">
+    <%= render partial: 'hubstats/partials/user-condensed', collection: @users, as: :user %>
+  </div>
+<% else %>
+  <p> No users to show </p>
+<% end %>

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

@@ -0,0 +1,7 @@
+<% if @users.length > 0 %>
+  <div class="users">
+    <%= render partial: 'hubstats/partials/user', collection: @users, as: :user %>
+  </div>
+<% else %>
+  <p> No users to show </p>
+<% end %>

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

@@ -1,6 +1,10 @@
 <div class="container" id="user"%>
   <div class="row"%>
     <div class="col-lg-3">
+      <div class="form-group">
+        <input class="select2-control" id="repos">
+        </input>
+      </div>
       <div class="form-group">
         <input class="select2-control" id="users">
         </input>
@@ -24,9 +28,9 @@
         </label>
       </div>
 
-            <div class="users">
-        <%= render partial: 'hubstats/partials/user', collection: @users, as: :user %>
-      </div>
+  
+      <%= render 'hubstats/tables/users' %>
+
       <div class="text-center">
         <%= will_paginate @users, renderer: BootstrapPagination::Rails %>
       </div>

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

@@ -1,18 +1,21 @@
 <div class="container" id="repo">
   <div class="row">
-    <h1 class="title text-center"> <%= @user.login %> </h1>
-    <%= render 'hubstats/metrics/quick_stats' %>
+    <h1 class="title text-center"><a href=<%=@user.html_url%>> <%= @user.login %></a> </h1>
+    <%= render 'hubstats/partials/quick_stats' %>
   </div>
   <div class="row">
-    <div class="col-lg-8 col-lg-offset-2 col-md-8 col-md-offset-2">
-      <h3> Comments </h3>
-      <% if @comments.length > 0 %>
-        <div class="comments">
-          <%= render partial: 'hubstats/partials/comment', collection: @comments, as: :comment %>
-        </div>
-      <% else %>
-        <p> No comments to show </p>
+
+    <div class="col-lg-6 col-md-5 col-sm-5 col-xs-5">
+      <h3> Pull Requests</h3> 
+      <%= render 'hubstats/tables/pulls-condensed' %>
+      <% if @pull_count > 20 %>
+        <p class="pull-right"><%= link_to "View All", pulls_path(:users => @user.id) %></p>
       <% end %>
     </div>
+
+    <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
+      <h3> Comments </h3>
+      <%= render 'hubstats/tables/comments-condensed' %>
+    </div>
   </div>
 </div>

data/config/routes.rb

@@ -1,7 +1,8 @@
 Hubstats::Engine.routes.draw do
-  root to: "repos#dashboard"
+  root to: "pull_requests#index"
 
   post "/handler" => "events#handler", :as => "handler"
+  get "/metrics" => "repos#dashboard", :as => "metrics" 
   get "/pulls" => "pull_requests#index", :as => :pulls
   get "/users" => "users#index", :as => :users
   get "/repos" => "repos#index", :as => :repos
@@ -9,7 +10,6 @@ Hubstats::Engine.routes.draw do
 
   get "/:repo" => "repos#show", :as => :repo
   scope "/:repo", :as => :repo do
-    get '/pulls' => "pull_requests#repo_index", :as => :pulls
     get '/pull/:id' => "pull_requests#show", :as => :pull
   end
 

data/lib/hubstats/events_handler.rb

@@ -29,9 +29,7 @@ module Hubstats
       comment[:repo_id] = payload[:repository][:id]
       comment[:pull_number] = get_pull_number(payload)
 
-      comment = Hubstats::Comment.create_or_update(comment.with_indifferent_access)
-      update_labels_from_comment(payload) if (kind == "Issue")
-      comment
+      Hubstats::Comment.create_or_update(comment.with_indifferent_access)
     end
 
     #grabs the number off of anyone of the various places it can be
@@ -47,13 +45,5 @@ module Hubstats
       end
     end
 
-    def update_labels_from_comment(payload)
-      repo_id = payload[:repository][:id]
-      number = payload[:issue][:number]
-      labels = payload[:issue][:labels]
-      pull = Hubstats::PullRequest.belonging_to_repo(repo_id).where(number: number).first
-      pull.add_labels(labels)
-    end
-    
   end
 end

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/test/dummy/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  mount Hubstats::Engine => "/hubstats"
+  mount Hubstats::Engine => "/"
 end

data/test/dummy/log/test.log

@@ -19710,3 +19710,36 @@ Connecting to database specified by database.yml
   Hubstats::User Exists (0.1ms)  SELECT 1 AS one FROM `hubstats_users` WHERE (`hubstats_users`.`id` = BINARY 10 AND `hubstats_users`.`id` != 10) LIMIT 1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.4ms)  ROLLBACK
+Connecting to database specified by database.yml
+   (0.0ms)  BEGIN
+Mysql2::Error: Table 'hubstats_test.hubstats_users' doesn't exist: SHOW FULL FIELDS FROM `hubstats_users`
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+Mysql2::Error: Table 'hubstats_test.hubstats_users' doesn't exist: SHOW FULL FIELDS FROM `hubstats_users`
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+Mysql2::Error: Table 'hubstats_test.hubstats_users' doesn't exist: SHOW FULL FIELDS FROM `hubstats_users`
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+Mysql2::Error: Table 'hubstats_test.hubstats_users' doesn't exist: SHOW FULL FIELDS FROM `hubstats_users`
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+Mysql2::Error: Table 'hubstats_test.hubstats_pull_requests' doesn't exist: SHOW FULL FIELDS FROM `hubstats_pull_requests`
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+Mysql2::Error: Table 'hubstats_test.hubstats_repos' doesn't exist: SHOW FULL FIELDS FROM `hubstats_repos`
+   (0.1ms)  ROLLBACK

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Elliot Hursh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,21 +166,28 @@ files:
 - app/models/hubstats/pull_request.rb
 - app/models/hubstats/repo.rb
 - app/models/hubstats/user.rb
-- app/views/hubstats/metrics/_comments_table.html.erb
-- app/views/hubstats/metrics/_pulls_table.html.erb
-- app/views/hubstats/metrics/_quick_stats.html.erb
-- app/views/hubstats/metrics/_repos_table.html.erb
-- app/views/hubstats/metrics/_users_table.html.erb
+- app/views/hubstats/partials/_comment-condensed.html.erb
 - app/views/hubstats/partials/_comment.html.erb
 - app/views/hubstats/partials/_header.html.erb
+- app/views/hubstats/partials/_pull-condensed.html.erb
 - app/views/hubstats/partials/_pull.html.erb
+- app/views/hubstats/partials/_quick_stats.html.erb
+- app/views/hubstats/partials/_repo.html.erb
+- app/views/hubstats/partials/_user-condensed.html.erb
 - app/views/hubstats/partials/_user.html.erb
 - app/views/hubstats/pull_requests/index.html.erb
-- app/views/hubstats/pull_requests/repo_index.html.erb
 - app/views/hubstats/pull_requests/show.html.erb
 - app/views/hubstats/repos/dashboard.html.erb
 - app/views/hubstats/repos/index.html.erb
 - app/views/hubstats/repos/show.html.erb
+- app/views/hubstats/tables/_comments-condensed.html.erb
+- app/views/hubstats/tables/_comments.html.erb
+- app/views/hubstats/tables/_pulls-condensed.html.erb
+- app/views/hubstats/tables/_pulls.html.erb
+- app/views/hubstats/tables/_repos-condensed.html.erb
+- app/views/hubstats/tables/_repos.html.erb
+- app/views/hubstats/tables/_users-condensed.html.erb
+- app/views/hubstats/tables/_users.html.erb
 - app/views/hubstats/users/index.html.erb
 - app/views/hubstats/users/show.html.erb
 - app/views/layouts/hubstats/application.html.erb
@@ -313,7 +320,6 @@ files:
 - test/dummy/tmp/cache/assets/E30/D10/sprockets%2F5be1e5ad45bde1dbd7fb9f8d720277ea
 - test/dummy/tmp/cache/assets/E41/A20/sprockets%2F23cef5db9fa9d95cf84a2c688b5fe6ab
 - test/dummy/tmp/cache/assets/E4E/EF0/sprockets%2F5783afe3d038c6cdce49c1cbdaa12acb
-- test/dummy/tmp/pids/server.pid
 - test/functional/hubstats/splash_controller_test.rb
 - test/hubstats_test.rb
 - test/integration/navigation_test.rb
@@ -454,7 +460,6 @@ test_files:
 - test/dummy/tmp/cache/assets/E30/D10/sprockets%2F5be1e5ad45bde1dbd7fb9f8d720277ea
 - test/dummy/tmp/cache/assets/E41/A20/sprockets%2F23cef5db9fa9d95cf84a2c688b5fe6ab
 - test/dummy/tmp/cache/assets/E4E/EF0/sprockets%2F5783afe3d038c6cdce49c1cbdaa12acb
-- test/dummy/tmp/pids/server.pid
 - test/functional/hubstats/splash_controller_test.rb
 - test/hubstats_test.rb
 - test/integration/navigation_test.rb

data/app/views/hubstats/metrics/_comments_table.html.erb

@@ -1,10 +0,0 @@
-<div class="row">
-  <h4> Comments </h4>
-  <% if @comments.length > 0 %>
-    <div class="comments">
-      <%= render partial: 'hubstats/partials/comment', collection: @comments, as: :comment %>
-    </div>
-  <% else %>
-    <p> No comments to show </p>
-  <% end %>
-</div>

data/app/views/hubstats/metrics/_pulls_table.html.erb

@@ -1,14 +0,0 @@
-<table class="table">
-  <tr>
-    <th>Pull Request</th>
-    <th>User</th>
-    <th>Closed</th>
-  </tr>
-  <% @pull_requests.each do |pull| %>
-    <tr>
-      <td><%= link_to pull.title, repo_pull_path({:repo => @repo.name, :id => pull.id}) %></td>
-      <td><%= pull.user.login %></td>
-      <td><%= distance_of_time_in_words(DateTime.now,pull.closed_at) %> ago</td>
-    </tr>
-  <% end %>
-</table>

data/app/views/hubstats/metrics/_repos_table.html.erb

@@ -1,8 +0,0 @@
-<table class="table">
-  <% @repos.each do |repo| %>
-    <tr>
-      <td><%= link_to repo.name, repo_path(repo)%></td>
-      <td><%= distance_of_time_in_words(DateTime.now,repo.updated_at) %> ago</td>
-    </tr>
-  <% end %>
-</table>

data/app/views/hubstats/metrics/_users_table.html.erb

@@ -1,14 +0,0 @@
-<table class="table">
-  <tr>
-    <th> User </th>
-    <th class="title"> Pull Requests </th>
-    <th class="title"> Comments </th>
-  </tr>
-  <% @users.each do |user| %>
-    <tr>
-      <td><%= link_to user.login, user_path(user) %> </td>
-      <td class="numeric"><%= user.pull_request_count %> </td>
-      <td class="numeric"><%= user.comment_count %></td>
-    </tr>
-  <% end %>
-</table>

data/app/views/hubstats/pull_requests/repo_index.html.erb

@@ -1,8 +0,0 @@
-<div class="container" id="pulls">
-  <div class="row">
-    <div class="col col-lg-5 col-lg-offset-2">
-      <h3> All Pull Requests</h3>
-      <%= render 'hubstats/metrics/pulls_table' %>
-    </div>
-  </div>
-</div>

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-48351