hubstats 0.3.11 → 0.3.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzM0YzBhYjY0OTVkNWYwZGU4ODUxODMxOTUwN2ZlMzcwZGE3YzdlYw==
+    MTIyNWM2ZWIwNWFmNjg5YWRmOWQ4ZjgyOGY4M2Q1ZmQ0ZjAzNjRhYg==
   data.tar.gz: !binary |-
-    ZGRiMDcxNWY1NjQ0ODM3MDBjMjA1YTg1NWM0MjcyZjcxMzIxMjE5Yg==
+    ZmJlZTIwMTgzYTk0NGJlMTg5YzBjZmFhMTFmOGUyNTI2MmEyOWY0YQ==
 SHA512:
   metadata.gz: !binary |-
-    MjFmNTMzZGExYTlmYzI5NzliYzc5YmY3YmUwOGU5OTUzYjg5OWRhZjdmZDdl
-    MzVhZjliMzJjNzc2NmQzNTc3YTIyZTFkNmQ5NjAxNjI4NDZhMTQ5MTczNzFh
-    NjhjNGVkOWY2N2NhYjVhZDhhNzcyMjJmMTA5NzRkNWUyYTZlZjc=
+    NjY4NTdlMGJmNmRlMDM3MmJhN2E4NzQ4MTY0YjUwZWFmYTgwNGYzNDE5OGZj
+    ODE2NzE5ZDc3MWYyY2IyMjQyOTZmMmI1YmM5YzZiOTM4Nzg3NTE3N2JhZjIz
+    YzY5OWFlZmMzNDk2ZjZkOWNmYTg1ZWZjZWE1NWY1ZWYzZGI2OGQ=
   data.tar.gz: !binary |-
-    MWQyZWZjYzFmZjVmMDczMTIwZDAwNzk2OWExM2ZjYWRlOWFmZjgzNzlmN2Zh
-    MjY5ZjMwNDVhNTZhODZmMTg2Nzc0NDNjM2E3NTQ3ZGU4ODY2MjRjMmUyYjcy
-    OTY0MDE0Zjc1ODM5YTIwMmRkMjViYWEwZjAyNjc1NTZjYTY5OTM=
+    MmVjYTBiMmJmZDIxMWVkZTNjNDJiYTdlMjdiOGY5NjMyOWEwYTQ5ZWI5NDdj
+    YzFiNGE5OTg5OWM1N2EyYTQwYTYyYzMwOTE3M2I2OGZkMDc3ZWViYzRlYTcx
+    YTc5MThlOWIwMGEyMDYyOGRlOThhNTkyMzhiZTk1YzcwZTBkOTM=

data/.codeclimate.yml

@@ -0,0 +1,7 @@
+languages:
+  Ruby: true
+  JavaScript: true
+  PHP: true
+  Python: true
+exclude_paths:
+- "app/assets/javascripts/hubstats/bootstrap.js"

data/CHANGELOG.markdown

@@ -1,3 +1,16 @@
+#### v0.3.12
+* Solving the server bug
+
+  > Emma Sax: Andy Fleener, Nick LaMuro: https://github.com/sportngin/hubstats/pull/63
+
+* Adding 2 lines to code climate yml
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/61
+
+* Add a codeclimate yml file to ignore bootstrap.js
+
+  > Emma Sax: : https://github.com/sportngin/hubstats/pull/60
+
 #### v0.3.11
 * Trying to fix potential bug that makes commissioner run out of memory
 

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

@@ -5,6 +5,10 @@ $(document).ready(function() {
   queryParameters = getUrlVars();
   setUserDefaults(queryParameters);
 
+  $("#name").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
+  });
+
   $("#deploys").on("click", function(){
     toggleOrder(queryParameters,$(this).attr('id'));
   });

data/app/controllers/hubstats/deploys_controller.rb

@@ -18,10 +18,10 @@ module Hubstats
     def show
       @deploy = Hubstats::Deploy.includes(:repo, :pull_requests).find(params[:id])
       repo = @deploy.repo
-      @pull_requests = @deploy.pull_requests
-      pull_request_count = @pull_requests.length
+      @pull_requests = @deploy.pull_requests.limit(20)
+      @pull_request_count = @pull_requests.length
       @stats_basics = {
-        pull_count: pull_request_count,
+        pull_count: @pull_request_count,
         net_additions: @deploy.find_net_additions,
         comment_count: @deploy.find_comment_count,
         additions: @deploy.total_changes(:additions),

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -6,12 +6,8 @@ module Hubstats
     def index
       URI.decode(params[:label]) if params[:label]
 
-      pull_ids = Hubstats::PullRequest
-        .belonging_to_users(params[:users])
-        .belonging_to_repos(params[:repos])
-        .map(&:id)
-
-      @labels = Hubstats::Label.with_a_pull_request(pull_ids).order("pull_request_count DESC")
+      pull_requests = PullRequest.all_filtered(params, @timespan)
+      @labels = Hubstats::Label.count_by_pull_requests(pull_requests).order("pull_request_count DESC")
 
       @pull_requests = Hubstats::PullRequest.includes(:user, :repo)
         .belonging_to_users(params[:users]).belonging_to_repos(params[:repos])

data/app/controllers/hubstats/repos_controller.rb

@@ -25,10 +25,10 @@ module Hubstats
       @deploy_count = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_since(@timespan).count(:all)
       @comment_count = Hubstats::Comment.belonging_to_repo(@repo.id).created_since(@timespan).count(:all)
       @user_count = Hubstats::User.with_pulls_or_comments(@timespan,@repo.id).only_active.length
-      @net_additions = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_since(@timespan).sum(:additions).to_i -
-                       Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_since(@timespan).sum(:deletions).to_i
-      @additions = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_since(@timespan).average(:additions)
-      @deletions = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_since(@timespan).average(:deletions)
+      @net_additions = Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i -
+                       Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).sum(:deletions).to_i
+      @additions = Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:additions)
+      @deletions = Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:deletions)
       
       stats
     end

data/app/models/hubstats/label.rb

@@ -1,13 +1,14 @@
 module Hubstats
   class Label < ActiveRecord::Base
-    scope :with_a_pull_request, lambda { |pull_ids|
-      select("hubstats_labels.*")
-      .select("COUNT(hubstats_labels_pull_requests.pull_request_id) AS pull_request_count")
-      .joins("LEFT JOIN hubstats_labels_pull_requests ON hubstats_labels_pull_requests.label_id = hubstats_labels.id")
-      .with_ids(pull_ids)
-      .having("pull_request_count > 0")
-      .group("hubstats_labels.id")
-    }
+
+  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

@@ -60,6 +60,16 @@ module Hubstats
       self.labels = labels
     end
 
+    def self.all_filtered(params, timespan)
+      filter_based_on_timespan(timespan, params[:state])
+      .belonging_to_users(params[:users])
+      .belonging_to_repos(params[:repos])
+    end
+
+    def self.filter_based_on_timespan(timespan, state)
+      with_state(state).updated_since(timespan)
+    end
+
     def self.state_based_order(timespan,state,order)
       order = ["ASC","DESC"].detect{|order_type| order_type.to_s == order.to_s.upcase } || "DESC"
       if state == "closed"

data/app/models/hubstats/repo.rb

@@ -83,6 +83,8 @@ module Hubstats
           order("average_additions #{order}")
         when 'deletions'
           order("average_deletions #{order}")
+        when 'name'
+          order("name #{order}")
         else
           order("pull_request_count #{order}")
         end

data/app/models/hubstats/user.rb

@@ -123,6 +123,8 @@ module Hubstats
           order("comment_count #{order}")
         when 'netadditions'
           order("additions - deletions #{order}")
+        when 'name'
+          order("login #{order}")
         else
           order("pull_request_count #{order}")
         end

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

@@ -18,6 +18,9 @@
     <div class="row">
       <h4> Pull Requests </h4>
       <%= render 'hubstats/tables/pulls-condensed' %>
+      <% if @pull_request_count > 20 %>
+        <p class="pull-right"><%= link_to "View All", pulls_path(:deploys => @deploy.id) %></p>
+      <% end %>
     </div>
   </div>
 

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

@@ -17,3 +17,7 @@
     </div>
   </div>
 </div>
+
+<div class="text-center">
+  <%= will_paginate @repo, renderer: BootstrapPagination::Rails %>
+</div>

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

@@ -2,6 +2,7 @@
   <div class="repos">
     <div class="row single-repo header">
       <div class="col-lg-2 col-md-2 col-sm-2">
+        <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>

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

@@ -2,6 +2,7 @@
   <div class="users">
     <div class="row single-user header">
       <div class="col-lg-4 col-md-4 col-sm-4">
+        <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>

data/lib/hubstats/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,6 +131,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .codeclimate.yml
 - .gitignore
 - .octopolo.yml
 - .rspec