hubstats 0.0.8 → 0.0.9

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

@@ -1,7 +1,10 @@
-<table class="table">
-  <% @comments.each do |comment| %>
-    <tr>
-      <td><%= comment.body %> by <b> <%= comment.user.login %> </b> <%= distance_of_time_in_words(DateTime.now,comment.created_at) %> ago </td>
-    </tr>
+<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 %>
-</table>
+</div>

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

@@ -6,7 +6,7 @@
   </tr>
   <% @pull_requests.each do |pull| %>
     <tr>
-      <td><%= link_to pull.title, repo_pull_request_path({:repo => @repo.name, :id => pull.id}) %></td>
+      <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>

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

@@ -0,0 +1,13 @@
+<div class="row single-comment">
+  <div class="user-image col-lg-1 col-md-1 col-sm-1">
+    <img src= <%= comment.user.avatar_url%> alt= <%= comment.user.login %> >
+  </div>
+
+  <div class="comment-info col-lg-11 col-md-11 col-sm-11">
+    <%= 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>

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

@@ -1,12 +1,30 @@
 <div class="container" id="header">
-  <div class="pull-left">
-    <div class="title"> <%= link_to "Hubstats: Github Metrics", root_path %> </div>
-  </div>
-  <div class="pull-right">
-    <select class="form-control" id="time-select">
-      <% Hubstats::TIMESPAN_ARRAY.each do |timespan| %>
-        <option value=<%= timespan[:date] %>><%=timespan[:display_value]%></option>
-      <% end %>
-    </select>
-  </div>
+  <nav class="navbar navbar-default" role="navigation">
+    <div class="container-fluid">
+
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand title" href="/hubstats/">Hubstats: Github Metrics</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 "Search", pulls_path%></li>
+          <li>
+            <select class="form-control push-down" id="time-select">
+              <% Hubstats::TIMESPAN_ARRAY.each do |timespan| %>
+                <option value=<%= timespan[:date] %>><%=timespan[:display_value]%></option>
+              <% end %>
+            </select>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </nav>
 </div>

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

@@ -0,0 +1,24 @@
+<div class="row single-pull">
+  <div class="user-image col-lg-1 col-md-1 col-sm-1" >
+    <img src= <%= pull.user.avatar_url%> alt= <%= pull.user.login %> >
+  </div>
+
+  <div class="pull-info col-lg-9 col-md-9 col-sm-9">
+    <h4> 
+      <%= link_to pull.repo.name, repo_path(pull.repo.name) %> / 
+      <%= 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" >
+    <div class="pull-right">
+      # <%= pull.number %>
+    </div>
+  </div>
+</div>

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

@@ -1,8 +1,55 @@
-<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 class="container" %>
+  <div class="row" %>
+    <div class="col col-lg-3 col-md-3 col-sm-3">
+
+      <div class="form-group">
+        <input class="select2-control" id="repos">
+        </input>
+      </div>
+      <div class="form-group">
+        <input class="select2-control" id="users">
+        </input>
+      </div>
+
+      <hr>
+      <h4> Labels </h4>
+      <% @labels.each do |label| %>
+        <div class="checkbox">
+          <label>
+            <input type="checkbox"> <%= label.name %> 
+            <span class="badge pull-right"><%= label.pull_request_count %></span>
+          </label>
+        </div>
+      <% end %>
+
+    </div>
+    <div class="col col-lg-9 col-md-9 col-sm-9">
+
+      <div id="state-group" class="btn-group" data-toggle="buttons">
+        <label class="btn btn-default" id="all">
+          <input type="radio" name="state"> All
+        </label>
+        <label class="btn btn-default" id="open">
+          <input type="radio" name="state"> Open
+        </label>
+        <label class="btn btn-default" id="closed">
+          <input type="radio" name="state"> Closed
+        </label>
+      </div>
+
+      <div id="sort-group" class="btn-group" data-toggle="buttons">
+        <label class="btn btn-default" id="desc">
+          <input type="radio" name="sort"> Newest
+        </label>
+        <label class="btn btn-default" id="asc">
+          <input type="radio" name="sort"> Oldest
+        </label>
+      </div>
+
+      <div class="pulls">
+        <%= render partial: 'hubstats/partials/pull', collection: @pull_requests, as: :pull %>
+      </div>
+
     </div>
   </div>
 </div>

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

@@ -0,0 +1,8 @@
+<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/app/views/hubstats/pull_requests/show.html.erb

@@ -1,15 +1,11 @@
 <div class="container" id="repo">
   <div class="row">
-    <div class="col col-lg-7">
-      <div class="row">
-        <h1 class="title text-center"> <%= @pull_request.title.titleize %> </h1>
-      </div>
-      <div class="row">
-        <h3> Comments </h3>
-        <%= render 'hubstats/metrics/comments_table' %>
-      </div>
-    </div>
+    <h3> <%= @pull_request.title.titleize %> </h3>
+    <%= render 'hubstats/metrics/quick_stats' %>
+  </div>
 
+  <div class="col col-lg-7">
+    <%= render 'hubstats/metrics/comments_table' %>
   </div>
 </div>
 

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

@@ -0,0 +1,21 @@
+<div class="container" id="splash">
+  <div class="row text-center">
+    <%= render 'hubstats/metrics/quick_stats' %>
+  </div>
+  <div class="row">
+    <div class="col col-lg-5">
+      <h3> Recently Active Repositories </h3>
+      <%= render 'hubstats/metrics/repos_table' %>
+      <% 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' %>
+      <% 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

@@ -1,16 +1,8 @@
-<div class="container" id="splash">
-  <div class="row">
-    <%= render 'hubstats/metrics/quick_stats' %>
-  </div>
+<div class="container">
   <div class="row">
     <div class="col col-lg-5">
       <h3> Recently Active Repositories </h3>
       <%= render 'hubstats/metrics/repos_table' %>
     </div>
-    <div class="col col-lg-5 col-lg-offset-2">
-      <h3> Most Active Users </h3>
-      <%= render 'hubstats/metrics/users_table' %>
-      <p class="pull-right"><%= link_to "View All", users_path %></p>
-    </div>
   </div>
-</div>
+</div

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

@@ -4,9 +4,15 @@
     <%= render 'hubstats/metrics/quick_stats' %>
   </div>
   <div class="row">
-    <div class="col col-lg-12">
-      <h3> Recent Comments </h3>
-      <%= render 'hubstats/metrics/comments_table' %>
+    <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>
+      <% end %>
     </div>
   </div>
 </div>

data/config/routes.rb

@@ -1,13 +1,16 @@
 Hubstats::Engine.routes.draw do
-  root to: "repos#index"
+  root to: "repos#dashboard"
+
   post "/handler" => "events#handler", :as => "handler"
+  get "/pulls" => "pull_requests#index", :as => :pulls
   get "/users" => "users#index", :as => :users
+  get "/repos" => "repos#index", :as => :repos
   get "/user/:id" => "users#show", :as => :user
 
   get "/:repo" => "repos#show", :as => :repo
   scope "/:repo", :as => :repo do
-    get '/pull_requests' => "pull_requests#index", :as => :pull_requests
-    get '/pull_request/:id' => "pull_requests#show", :as => :pull_request
+    get '/pulls' => "pull_requests#repo_index", :as => :pulls
+    get '/pull/:id' => "pull_requests#show", :as => :pull
   end
 
 end

data/db/migrate/20140604130339_create_hubstats_pull_requests.rb

@@ -2,6 +2,18 @@ class CreateHubstatsPullRequests < ActiveRecord::Migration
   def change
     create_table :hubstats_pull_requests do |t|
       t.integer :id
+      t.integer :number
+      t.belongs_to :user
+      t.belongs_to :repo
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.datetime :closed_at
+      t.integer :additions
+      t.integer :deletions
+      t.integer :comments
+      t.integer :commits
+      t.integer :changed_files
+
       t.string :url
       t.string :html_url
       t.string :diff_url
@@ -12,25 +24,13 @@ class CreateHubstatsPullRequests < ActiveRecord::Migration
       t.string :review_comment_url
       t.string :comments_url
       t.string :statuses_url
-      t.integer :number
       t.string :state
       t.string :title
       t.string :body
-      t.string :created_at
-      t.string :updated_at
-      t.string :closed_at
       t.string :merged_at
       t.string :merge_commit_sha
       t.string :merged
       t.string :mergeable
-      t.integer :comments
-      t.integer :commits
-      t.integer :additions
-      t.integer :deletions
-      t.integer :changed_files
-      t.belongs_to :user
-      t.belongs_to :repo
-      t.timestamps
     end
 
     add_index :hubstats_pull_requests, :user_id

data/db/migrate/20140604130457_create_hubstats_users.rb

@@ -3,6 +3,10 @@ class CreateHubstatsUsers < ActiveRecord::Migration
     create_table :hubstats_users do |t|
       t.string :login
       t.integer :id
+      t.string :role
+      t.boolean :site_admin
+      t.timestamps
+      
       t.string :avatar_url
       t.string :gravatar_id
       t.string :url
@@ -16,9 +20,6 @@ class CreateHubstatsUsers < ActiveRecord::Migration
       t.string :repos_url
       t.string :events_url
       t.string :received_events_url
-      t.string :role
-      t.boolean :site_admin
-      t.timestamps
     end
   end
 end

data/db/migrate/20140604130504_create_hubstats_comments.rb

@@ -2,9 +2,14 @@ class CreateHubstatsComments < ActiveRecord::Migration
   def change
     create_table :hubstats_comments do |t|
       t.integer :id
-      t.string :html_url
-      t.string :url
-      t.string :pull_request_url
+      t.string :kind
+      t.belongs_to :user
+      t.belongs_to :pull_request
+      t.belongs_to :repo
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.string :body
+
       t.string :diff_hunk
       t.integer :path
       t.integer :position
@@ -12,12 +17,10 @@ class CreateHubstatsComments < ActiveRecord::Migration
       t.string :line
       t.string :commit_id
       t.string :original_commit_id
-      t.string :body
-      t.string :kind
-      t.belongs_to :user
-      t.belongs_to :pull_request
-      t.belongs_to :repo
-      t.timestamps
+
+      t.string :html_url
+      t.string :url
+      t.string :pull_request_url
     end
 
     add_index :hubstats_comments, :user_id

data/db/migrate/20140604130550_create_hubstats_repos.rb

@@ -2,10 +2,25 @@ class CreateHubstatsRepos < ActiveRecord::Migration
   def change
     create_table :hubstats_repos do |t|
       t.integer :id
+      t.belongs_to :owner
       t.string :name
       t.string :full_name
+      t.datetime :pushed_at
+      t.datetime :created_at
+      t.datetime :updated_at
+
       t.string :homepage
       t.string :language
+      t.integer :forks_count
+      t.integer :stargazers_count
+      t.integer :watches_count
+      t.integer :size 
+      t.integer :open_issues_count
+      t.boolean :has_issues
+      t.boolean :has_wiki
+      t.boolean :has_downloads
+      t.boolean :private
+      t.boolean :fork
       t.string :description
       t.string :default_branch
       t.string :url
@@ -25,21 +40,6 @@ class CreateHubstatsRepos < ActiveRecord::Migration
       t.string :issues_url
       t.string :pulls_url
       t.string :labels_url
-      t.integer :forks_count
-      t.integer :stargazers_count
-      t.integer :watches_count
-      t.integer :size 
-      t.integer :open_issues_count
-      t.boolean :has_issues
-      t.boolean :has_wiki
-      t.boolean :has_downloads
-      t.boolean :private
-      t.boolean :fork
-      t.datetime :pushed_at
-      t.datetime :created_at
-      t.datetime :updated_at
-      t.belongs_to :owner
-      t.timestamps
     end
 
      add_index :hubstats_repos, :owner_id

data/db/migrate/20140703173123_create_hubstats_labels.rb

@@ -0,0 +1,9 @@
+class CreateHubstatsLabels < ActiveRecord::Migration
+  def change
+    create_table :hubstats_labels do |t|
+      t.string :name
+      t.string :color
+      t.string :url
+    end
+  end
+end