hubstats 0.3.8 → 0.3.9

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

@@ -36,20 +36,7 @@
   <!-- Show the net additions using the average_additions and the average_deletions -->
   <div class="col-lg-2 col-md-2 col-sm-2">
     <div class="text-center">
-      <span class="text-large"><%= user.average_additions - user.average_deletions %></span>
+      <span class="text-large"><%= user.additions - user.deletions %></span>
     </div>
   </div>
-<!--   <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="text-center">
-      <span class="text-medium"><%= user.average_additions %></span>
-      <span class="octicon octicon-plus"></span>
-    </div>
-  </div>
-  <div class="col-lg-2 col-md-2 col-sm-2">
-    <div class="text-center">
-      <span class="text-medium"><%= user.average_deletions %></span>
-      <span class="octicon octicon-dash"></span>
-    </div>
-  </div> -->
-
 </div>

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

@@ -6,6 +6,7 @@
     <br>
     <br>
     <br>
+    <br>
     <%= render 'hubstats/partials/quick_addition_stats' %>
   </div>
   
@@ -14,6 +15,5 @@
       <h3> All Repositories </h3>       
       <%= render 'hubstats/tables/repos' %>
     </div>
-    
   </div>
 </div>

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

@@ -1,5 +1,4 @@
 <div class="container" id="repo">
-
   <div class="row">
     <h1 class="title text-center"><a href=<%=@repo.html_url%>> <%= @repo.name.titleize %> </a></h1>
     <%= render 'hubstats/partials/quick_stats' %>    
@@ -8,13 +7,14 @@
     <br>
     <br>
     <br>
+    <br>
     <%= render 'hubstats/partials/quick_addition_stats' %>
   </div>
 
   <div class="row">
 
     <div class="col col-lg-6">
-      <h3> Pull Requests</h3>       
+      <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>
@@ -29,12 +29,5 @@
         <p class="pull-right"><%= link_to "View All", deploys_path(:repos => @repo.id) %></p>
       <% end %>
     </div>
-
-    <!-- <div class="col col-lg-6"> -->
-      <!-- <h3> Active Users </h3> -->
-      <!-- <%= render 'hubstats/tables/users-condensed' %> -->
-    <!-- </div> -->
-
   </div>
-
 </div>

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

@@ -1,5 +1,24 @@
 <% if @repos.length > 0 %>
   <div class="repos">
+    <div class="row single-repo header">
+      <div class="col-lg-2 col-md-2 col-sm-2">
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="deploys"> Deploys <span class="octicon"></span> </a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="pulls"> Pulls <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>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="additions"> Average Additions <span class="octicon"></span></a>
+      </div>
+      <div class="col-lg-2 col-md-2 col-sm-2">
+        <a class="header desc" id="deletions"> Average Deletions <span class="octicon"></span></a>
+      </div>
+    </div>
     <%= render partial: 'hubstats/partials/repo', collection: @repos, as: :repo %>
   </div>
 <% else %>

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

@@ -14,14 +14,8 @@
       </div>
       <!-- Show the net additions instead of the additions and deletions separately -->
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="additions"> Net Average Additions <span class="octicon"></span></a>
+        <a class="header desc" id="netadditions"> Net Additions <span class="octicon"></span></a>
       </div>
-<!--  <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="additions"> Additions <span class="octicon"></span></a>
-      </div>
-      <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="deletions"> Deletions <span class="octicon"></span></a>
-      </div> -->
     </div>
     <%= render partial: 'hubstats/partials/user', collection: @users, as: :user %>
   </div>

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

@@ -13,15 +13,13 @@
       <% 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> -->
-
     <!-- Show all of the deploys this user did -->
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
       <h3> Deploys </h3>
       <%= render 'hubstats/tables/deploys-condensed' %>
+      <% if @deploy_count > 20 %>
+        <p class="pull-right"><%= link_to "View All", deploys_path(:users => @user.id) %></p>
+      <% end %>
     </div>
   </div>
 </div>

data/config/routes.rb

@@ -1,13 +1,13 @@
 Hubstats::Engine.routes.draw do
-  root to: "pull_requests#index" #sets default root to be the pulls page
+  root to: "pull_requests#index" # sets default root to be the pulls page
   post "/handler" => "events#handler", :as => :handler
-  resources :deploys, :only => [:create, :index, :show] #routes to index, show, and to create method
-  get "/metrics" => "repos#dashboard", :as => :metrics #routes to list of repos and stats
-  get "/pulls" => "pull_requests#index", :as => :pulls #routes to list of pulls
-  get "/users" => "users#index", :as => :users #routes to list of users
-  get "/user/:id" => "users#show", :as => :user #routes to specific user's contributions
-  get "/repos" => "repos#index", :as => :repos #route is for the repo filter on the pull request and deploys page
-  get "/:repo" => "repos#show", :as => :repo #routes to specific repo's stats
+  resources :deploys, :only => [:create, :index, :show] # routes to index, show, and to create method
+  get "/metrics" => "repos#dashboard", :as => :metrics # routes to list of repos and stats
+  get "/pulls" => "pull_requests#index", :as => :pulls # routes to list of pulls
+  get "/users" => "users#index", :as => :users # routes to list of users
+  get "/user/:id" => "users#show", :as => :user # routes to specific user's contributions
+  get "/repos" => "repos#index", :as => :repos # route is for the repo filter on the pull request and deploys page
+  get "/:repo" => "repos#show", :as => :repo # routes to specific repo's stats
   scope "/:repo", :as => :repo do
     get '/pull/:id' => "pull_requests#show", :as => :pull
   end

data/lib/hubstats/github_api.rb

@@ -181,15 +181,13 @@ module Hubstats
     end
 
     def self.route(object, kind, repo_name = nil)
+      repo = Hubstats::Repo.where(full_name: repo_name).first
       if kind == "pulls/comments"
-        repo = Hubstats::Repo.where(full_name: repo_name).first
-        Hubstats::Comment.create_or_update(HubHelper.comment_setup(object,repo.id,"PullRequest"))
+        create_or_update(object, repo, "PullRequest")
       elsif kind == "issues/comments"
-        repo = Hubstats::Repo.where(full_name: repo_name).first
-        Hubstats::Comment.create_or_update(HubHelper.comment_setup(object,repo.id,"Issue"))
+        create_or_update(object, repo, "Issue")
       elsif kind == "comments"
-        repo = Hubstats::Repo.where(full_name: repo_name).first
-        Hubstats::Comment.create_or_update(HubHelper.comment_setup(object,repo.id,"Commit"))
+        create_or_update(object, repo, "Commit")
       elsif kind == "pulls"
         Hubstats::PullRequest.create_or_update(HubHelper.pull_setup(object))
       elsif kind == "issues"
@@ -200,6 +198,10 @@ module Hubstats
         end
       end
     end
+
+    def create_or_update (object, repo, item)
+      Hubstats::Comment.create_or_update(HubHelper.comment_setup(object, repo.id, item))
+    end
   end
 end
     

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/controllers/hubstats/deploys_controller_spec.rb

@@ -3,6 +3,49 @@ require 'spec_helper'
 module Hubstats
   describe DeploysController, :type => :controller do
     routes { Hubstats::Engine.routes }
+    
+    describe "#index" do
+      it "should correctly order all of the deploys" do
+        repo = create(:repo, :full_name => "sportngin/ngin")
+        deploy1 = create(:deploy, :git_revision => "c1a2b37",
+                                  :repo_id => 101010,
+                                  :deployed_at => "2009-02-03 03:00:00 -0500",
+                                  :user_id => 404040)
+        deploy2 = create(:deploy, :git_revision => "kd9c102",
+                                  :repo_id => 101010,
+                                  :deployed_at => "2015-02-03 03:00:00 -0500",
+                                  :user_id => 303030)
+        deploy3 = create(:deploy, :git_revision => "owk19sf",
+                                  :repo_id => 101010,
+                                  :deployed_at => "2011-02-03 03:00:00 -0500",
+                                  :user_id => 202020)
+        deploy4 = create(:deploy, :git_revision => "owk19sf",
+                                  :repo_id => 101010,
+                                  :deployed_at => "2011-02-03 03:00:00 -0500",
+                                  :user_id => nil)
+        deploys_ordered = [deploy2, deploy3, deploy1]
+        expect(Hubstats::Deploy).to receive_message_chain("group_by.order_with_timespan.paginate").and_return(deploys_ordered)
+        get :index
+        expect(response).to have_http_status(200)
+        expect(response).to render_template(:index)
+      end
+    end
+
+    describe "#show" do
+      it "should show the pull requests of the specific deploy" do
+        repo = create(:repo, :full_name => "sportngin/ngin")
+        deploy = create(:deploy, :git_revision => "c1a2b37",
+                                 :repo_id => 101010,
+                                 :deployed_at => "2009-02-03 03:00:00 -0500")
+        pull1 = create(:pull_request, :deploy_id => deploy.id, :repo => repo)
+        pull2 = create(:pull_request, :deploy_id => deploy.id, :repo => repo)
+        get :show, id: deploy.id
+        expect(assigns(:deploy)).to eq(deploy)
+        expect(assigns(:pull_requests)).to contain_exactly(pull1, pull2)
+        expect(assigns(:deploy).repo_id).to eq(101010)
+      end
+    end
+
     describe "#create" do
 
       before :each do
@@ -98,52 +141,5 @@ module Hubstats
         expect(response).to have_http_status(400)
       end
     end
-
-    describe "#index" do
-
-      before :each do
-        create(:repo, :full_name => "sportngin/ngin")
-      end
-
-      it "should correctly order all of the deploys" do
-        deploy1 = create(:deploy, :git_revision => "c1a2b37",
-                                  :repo_id => 101010,
-                                  :deployed_at => "2009-02-03 03:00:00 -0500",
-                                  :user_id => 404040)
-        deploy2 = create(:deploy, :git_revision => "kd9c102",
-                                  :repo_id => 101010,
-                                  :deployed_at => "2015-02-03 03:00:00 -0500",
-                                  :user_id => 303030)
-        deploy3 = create(:deploy, :git_revision => "owk19sf",
-                                  :repo_id => 101010,
-                                  :deployed_at => "2011-02-03 03:00:00 -0500",
-                                  :user_id => 202020)
-        deploy4 = create(:deploy, :git_revision => "owk19sf",
-                                  :repo_id => 101010,
-                                  :deployed_at => "2011-02-03 03:00:00 -0500",
-                                  :user_id => nil)
-        deploys_ordered = [deploy2, deploy3, deploy1]
-        expect(Hubstats::Deploy).to receive_message_chain("group_by.order_with_timespan.paginate").and_return(deploys_ordered)
-        get :index
-        expect(response).to have_http_status(200)
-        expect(response).to render_template(:index)
-      end
-    end
-
-    describe "#show" do
-
-      before :each do
-        create(:repo, :full_name => "sportngin/ngin")
-      end
-
-      it "should show the pull requests of the specific deploy" do
-        deploy = create(:deploy, :git_revision => "c1a2b37",
-                        :repo_id => 101010,
-                        :deployed_at => "2009-02-03 03:00:00 -0500")
-        get :show, id: deploy.id
-        expect(assigns(:deploy)).to eq(deploy)
-        expect(assigns(:deploy).repo_id).to eq(101010)
-      end
-    end
   end
 end

data/spec/controllers/hubstats/pull_requests_controller_spec.rb

@@ -1,7 +1,46 @@
 require 'spec_helper'
 
 module Hubstats
-  RSpec.describe PullRequestsController, :type => :controller do
-  
+  describe PullRequestsController, :type => :controller do
+    routes { Hubstats::Engine.routes }
+    
+    describe "#index" do
+      it "should correctly order all of the pull requests" do
+        user = build(:user)
+        repo = build(:repo)
+        pull3 = create(:pull_request, :user => user,
+                                      :repo => repo)
+        pull1 = create(:pull_request, :user => user,
+                                      :repo => repo)
+        pull4 = create(:pull_request, :user => user,
+                                      :repo => repo)
+        pull2 = create(:pull_request, :user => user,
+                                      :repo => repo)
+        pulls_ordered = [pull3, pull1, pull4, pull2]
+        expect(Hubstats::PullRequest).to receive_message_chain("group_by.with_label.state_based_order.paginate").and_return(pulls_ordered)
+        get :index
+        expect(response).to have_http_status(200)
+        expect(response).to render_template(:index)
+      end
+    end
+
+    describe "#show" do
+      it "should show the comments and deploy of specific pull request" do
+        user = build(:user)
+        repo = build(:repo)
+        pull = create(:pull_request, :user => user,
+                                     :repo => repo,
+                                     :deploy_id => 404040)
+        comment1 = create(:comment, :pull_request_id => pull.id)
+        comment2 = create(:comment, :pull_request_id => pull.id)
+        comment3 = create(:comment, :pull_request_id => pull.id)
+        get :show, repo: repo, id: pull.id
+        expect(assigns(:pull_request)).to eq(pull)
+        expect(assigns(:pull_request).repo_id).to eq(101010)
+        expect(assigns(:pull_request).deploy_id).to eq(404040)
+        expect(assigns(:comments)).to contain_exactly(comment1, comment2, comment3)
+        expect(assigns(:pull_request).user_id).to eq(user.id)
+      end
+    end
   end
 end

data/spec/controllers/hubstats/repos_controller_spec.rb

@@ -1,7 +1,67 @@
 require 'spec_helper'
 
 module Hubstats
-  RSpec.describe ReposController, :type => :controller do
-  
+  describe ReposController, :type => :controller do
+    routes { Hubstats::Engine.routes }
+
+    describe "#index" do
+      it "should list all of the repos" do        
+        repo1 = create(:repo, :id => 101010,
+                              :name => "silly",
+                              :full_name => "sportngin/silly")
+        repo2 = create(:repo, :id => 202020,
+                              :name => "funny",
+                              :full_name => "sportngin/funny")
+        repo3 = create(:repo, :id => 303030,
+                              :name => "loosey",
+                              :full_name => "sportngin/loosey")
+        repo4 = create(:repo, :id => 404040,
+                              :name => "goosey",
+                              :full_name => "sportngin/goosey")
+        get :index
+        expect(assigns(:repos)).to contain_exactly(repo2, repo1, repo3, repo4)
+      end
+    end
+
+    describe "#show" do
+      it "should show the pull requests and deploys of specific repository" do
+        repo = create(:repo, :id => 101010,
+                             :name => "example",
+                             :full_name => "sportngin/example",
+                             :owner_id => 606060)
+        pull1 = create(:pull_request, :repo_id => 101010,
+                                      :updated_at => "2015-06-02 19:49:42")
+        pull2 = create(:pull_request, :repo_id => 101010,
+                                      :updated_at => "2015-04-21 17:06:31")
+        user = create(:user, :id => 606060)
+        deploy1 = create(:deploy, :repo_id => 101010)
+        deploy2 = create(:deploy, :repo_id => 101010)
+        get :show, repo: repo.name
+        expect(assigns(:repo)).to eq(repo)
+        expect(assigns(:repo).pull_requests).to contain_exactly(pull1, pull2)
+        expect(assigns(:repo).deploys).to contain_exactly(deploy1, deploy2)
+        expect(assigns(:repo).owner_id).to eq(user.id)
+      end
+    end
+
+    describe "#dashboard" do
+      it "should list all of the repos and the basic metrics" do
+        repo1 = create(:repo, :id => 101010,
+                              :name => "silly",
+                              :full_name => "sportngin/silly")
+        repo2 = create(:repo, :id => 202020,
+                              :name => "funny",
+                              :full_name => "sportngin/funny")
+        repo3 = create(:repo, :id => 303030,
+                              :name => "loosey",
+                              :full_name => "sportngin/loosey")
+        repo4 = create(:repo, :id => 404040,
+                              :name => "goosey",
+                              :full_name => "sportngin/goosey")
+        expect(Hubstats::Repo).to receive_message_chain("with_id.custom_order.paginate").and_return([repo1, repo2, repo3, repo4])
+        get :dashboard
+        expect(response).to have_http_status(200)
+      end
+    end
   end
 end

data/spec/controllers/hubstats/users_controller_spec.rb

@@ -1,7 +1,35 @@
 require 'spec_helper'
 
 module Hubstats
-  RSpec.describe UsersController, :type => :controller do
-  
+  describe UsersController, :type => :controller do
+    routes { Hubstats::Engine.routes }
+
+    describe "#index" do
+      it "should show all of the users" do
+        user2 = create(:user, :id => 101010, :login => "examplePerson1")
+        user1 = create(:user, :id => 202020, :login => "examplePerson2")
+        user3 = create(:user, :id => 303030, :login => "examplePerson3")
+        user4 = create(:user, :id => 404040, :login => "examplePerson4")
+        expect(Hubstats::User).to receive_message_chain("with_id.custom_order.paginate").and_return([user2, user3, user1, user4])
+        get :index
+      end
+    end
+
+    describe "#show" do
+      it "should show the pull requests and deploys of specific user" do
+        user = create(:user, :id => 101010, :login => "examplePerson")
+        pull1 = create(:pull_request, :user => user, :id => 202020)
+        pull2 = create(:pull_request, :user => user, :id => 303030, :repo => pull1.repo)
+        deploy1 = create(:deploy, :user_id => 101010)
+        deploy2 = create(:deploy, :user_id => 101010)
+        comment1 = create(:comment, :user => user)
+        comment2 = create(:comment, :user => user)
+        get :show, id: "examplePerson"
+        expect(assigns(:user)).to eq(user)
+        expect(assigns(:user).pull_requests).to contain_exactly(pull1, pull2)
+        expect(assigns(:user).deploys).to contain_exactly(deploy1, deploy2)
+        expect(assigns(:user).comments).to contain_exactly(comment2, comment1)
+      end
+    end
   end
 end