hubstats 0.3.12 → 0.3.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTIyNWM2ZWIwNWFmNjg5YWRmOWQ4ZjgyOGY4M2Q1ZmQ0ZjAzNjRhYg==
+    ZDAxN2M4MjI1MTU0NjMyNGIxZjJmZDUxZTExNTY0ZmRjMDU3ZmJkYw==
   data.tar.gz: !binary |-
-    ZmJlZTIwMTgzYTk0NGJlMTg5YzBjZmFhMTFmOGUyNTI2MmEyOWY0YQ==
+    NTVhOWIzOTcyYzgzYzA4YzU4ZDY2OGRhZTE4NzBjNTJiZGVmMjRjOQ==
 SHA512:
   metadata.gz: !binary |-
-    NjY4NTdlMGJmNmRlMDM3MmJhN2E4NzQ4MTY0YjUwZWFmYTgwNGYzNDE5OGZj
-    ODE2NzE5ZDc3MWYyY2IyMjQyOTZmMmI1YmM5YzZiOTM4Nzg3NTE3N2JhZjIz
-    YzY5OWFlZmMzNDk2ZjZkOWNmYTg1ZWZjZWE1NWY1ZWYzZGI2OGQ=
+    YmZjMTQ3MmQ5OGJmMzc1OGRiMDNjYTg1YTdlZGMyODFmNzI5ODU3Y2YyMzA3
+    MmY4YzNiNGMzMDcyNGQ3MGNiNGQ0ZTg1NGFmNTVhZmRhMjY3NGM0ODBjMWIz
+    OWE1MWI4MTQ3Y2ZhOGVhMmQ5NzkyZGFhOTUwMWZiYWQwOGE0YzQ=
   data.tar.gz: !binary |-
-    MmVjYTBiMmJmZDIxMWVkZTNjNDJiYTdlMjdiOGY5NjMyOWEwYTQ5ZWI5NDdj
-    YzFiNGE5OTg5OWM1N2EyYTQwYTYyYzMwOTE3M2I2OGZkMDc3ZWViYzRlYTcx
-    YTc5MThlOWIwMGEyMDYyOGRlOThhNTkyMzhiZTk1YzcwZTBkOTM=
+    YmMyOThlM2M5NTg1YTA1MjJkODczNmQ5MWZkMjM0MDcxNzY1ODRlYTlmZDA0
+    OTYxMDNlYjJiMTQzNjUwODQ1NWU4Nzg5MjcwOWIyMzdiNzIwNDhhMjcwM2E0
+    OTdlNTY5OTY4NTQ5ZDhmZTIzYzQzNmVmZTNlYzBjOGIzZjM0Nzk=

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v0.3.13
+* Adding the nagivation bar highlights
+
+  > Emma Sax: Nick LaMuro: https://github.com/sportngin/hubstats/pull/64
+
 #### v0.3.12
 * Solving the server bug
 

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

@@ -3667,6 +3667,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .navbar-collapse.in {
   overflow-y: auto;
 }
+.navbar-active {
+  font-weight: bold;
+  color: #E0E0E0;
+  background-color: #E0E0E0;
+  border-color: #E0E0E0;
+}
 @media (min-width: 768px) {
   .navbar-collapse {
     width: auto;

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

@@ -14,10 +14,9 @@
   box-shadow: none;
 }
 
-
 .circle-label {
   width: 5px;
   height: 14px;
   border-radius: 100%;
   margin: 2px 4px 0px 0px;
-}
+}

data/app/models/hubstats/label.rb

@@ -1,14 +1,14 @@
 module Hubstats
   class Label < ActiveRecord::Base
 
-  def self.count_by_pull_requests(pull_requests)
-    select("hubstats_labels.*")
-    .select("COUNT(hubstats_labels_pull_requests.pull_request_id) AS pull_request_count")
-    .joins(:pull_requests).merge(pull_requests)
-    .having("pull_request_count > 0")
-    .group("hubstats_labels.id")
-    .order("pull_request_count DESC")
-end
+    def self.count_by_pull_requests(pull_requests)
+      select("hubstats_labels.*")
+       .select("COUNT(hubstats_labels_pull_requests.pull_request_id) AS pull_request_count")
+       .joins(:pull_requests).merge(pull_requests)
+       .having("pull_request_count > 0")
+       .group("hubstats_labels.id")
+       .order("pull_request_count DESC")
+    end
 
     scope :with_ids, lambda { |pull_ids| (where("hubstats_labels_pull_requests.pull_request_id" => pull_ids)) }
 

data/app/models/hubstats/pull_request.rb

@@ -62,8 +62,8 @@ module Hubstats
 
     def self.all_filtered(params, timespan)
       filter_based_on_timespan(timespan, params[:state])
-      .belonging_to_users(params[:users])
-      .belonging_to_repos(params[:repos])
+       .belonging_to_users(params[:users])
+       .belonging_to_repos(params[:repos])
     end
 
     def self.filter_based_on_timespan(timespan, state)

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

@@ -14,10 +14,14 @@
 
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav navbar-right">
-          <li><%= link_to "Deploys", deploys_path%></li>
-          <li><%= link_to "Metrics", metrics_path%></li>
-          <li><%= link_to "Pulls", root_path%></li>
-          <li><%= link_to "Users", users_path%></li>
+          <li class="<%='navbar-active' if params[:controller] == 'hubstats/deploys'%>">
+              <%= link_to "Deployments", deploys_path%></li>
+          <li class="<%='navbar-active' if params[:controller] == 'hubstats/repos'%>">
+              <%= link_to "Metrics", metrics_path%></li>
+          <li class="<%='navbar-active' if params[:controller] == 'hubstats/pull_requests'%>">
+              <%= link_to "Pull Requests", root_path%></li>
+          <li class="<%='navbar-active' if params[:controller] == 'hubstats/users'%>">
+              <%= link_to "Users", users_path%></li>
           <li>
             <select class="form-control push-down" id="time-select">
               <% Hubstats::TIMESPAN_ARRAY.each do |timespan| %>

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

@@ -8,13 +8,13 @@
 <% 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 </h4>
+	  <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 </h4>
+	  <h4> Average Deletions per Pull Request </h4>
 	</div>
 <% end %>
 <% if @stats_additions.has_key? :additions %>

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

@@ -9,7 +9,7 @@
 <% 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> Deploys </h4>
+	  <h4> Deployments </h4>
 	</div>
 <% end %>
 <% if @stats_basics.has_key? :pull_count %>
@@ -39,13 +39,13 @@
 <% 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 </h4>
+	  <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 </h4>
+	  <h4> Average Deletions per Pull Request </h4>
 	</div>
 <% end %>
 <% if @stats_basics.has_key? :additions %>

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

@@ -1,7 +1,6 @@
 <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>
@@ -10,8 +9,9 @@
         <input class="select2-control" id="users">
         </input>
       </div>
-
+      
       <hr>
+      
       <h4> Labels </h4>
       <div id="labels-container">
         <% @labels.each do |label| %>
@@ -22,10 +22,9 @@
           </a>
         <% end %>
       </div>
-
     </div>
-    <div class="col col-lg-9 col-md-9 col-sm-9">
 
+    <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
@@ -54,11 +53,10 @@
       </select>
 
       <%= render 'hubstats/tables/grouped_pulls' %>
-  
+
       <div class="text-center">
         <%= will_paginate @pull_requests, renderer: BootstrapPagination::Rails %>
       </div>
-
     </div>
   </div>
-</div>
+</div>

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

@@ -12,7 +12,7 @@
   
   <div class="row">
     <div class="col col-lg-12">
-      <h3> All Repositories </h3>       
+      <h3> Repositories </h3>       
       <%= render 'hubstats/tables/repos' %>
     </div>
   </div>

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

@@ -23,7 +23,7 @@
 
     <!-- Show all of the deploys for this repository -->
     <div class="col col-lg-6">
-      <h3> Deploys </h3>
+      <h3> Deployments </h3>
       <%= render "hubstats/tables/deploys-condensed" %>
       <% if @deploy_count > 20 %>
         <p class="pull-right"><%= link_to "View All", deploys_path(:repos => @repo.id) %></p>

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

@@ -3,5 +3,5 @@
     <%= render partial: 'hubstats/partials/deploy', collection: @deploys, as: :deploy %>
   </div>
 <% else %>
-  <p> No deploys to show </p>
+  <p> No deployments to show </p>
 <% end %>

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

@@ -12,5 +12,5 @@
     <%= render 'hubstats/tables/deploys' %>
   <% end %>
 <% else %>
-  <p> No deploys to show </p>
+  <p> No deployments to show </p>
 <% end %>

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

@@ -3,6 +3,6 @@
     <%= render partial: 'hubstats/partials/repo-condensed', collection: @repos, as: :repo %>
   </div>
 <% else %>
-  <p> No repos to show </p>
+  <p> No repositories to show </p>
 <% end %>
 

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

@@ -5,10 +5,10 @@
         <a class="header desc" id="name"> Repository Name <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="deploys"> Deploys <span class="octicon"></span> </a>
+        <a class="header desc" id="deploys"> Deployments <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>
+        <a class="header desc" id="pulls"> 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>
@@ -23,6 +23,6 @@
     <%= render partial: 'hubstats/partials/repo', collection: @repos, as: :repo %>
   </div>
 <% else %>
-  <p> No repos to show </p>
+  <p> No repositories to show </p>
 <% end %>
 

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

@@ -5,10 +5,10 @@
         <a class="header desc" id="name"> GitHub Username <span class="octicon"></span> </a>
       </div>
       <div class="col-lg-2 col-md-2 col-sm-2">
-        <a class="header desc" id="deploys"> Deploys <span class="octicon"></span> </a>
+        <a class="header desc" id="deploys"> Deployments <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>
+        <a class="header desc" id="pulls"> 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>

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

@@ -15,7 +15,7 @@
 
     <!-- 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>
+      <h3> Deployments </h3>
       <%= render 'hubstats/tables/deploys-condensed' %>
       <% if @deploy_count > 20 %>
         <p class="pull-right"><%= link_to "View All", deploys_path(:users => @user.id) %></p>

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Elliot Hursh