hubstats 0.3.8 → 0.3.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQ2OWYyM2Q1ZjVkOTJlOTdkMDAwNGRmZDY2OWIwZWZmMWM2MGYxNw==
+    ZDllYTczYjQ4OTgxNTcxNTIxNjBhMWM2MTRiYWNlNDlmMDBmOGQ3OA==
   data.tar.gz: !binary |-
-    Y2QxN2YxY2U5YmEyMmU4ZDRmMGY5NmU5ZTFhNzVjMDE5MDI5YzBjMg==
+    NmRmMTc1NDQ3YWNlODkzYjY0MWVmMGI3YjgyNTVjODg1OTc5NmZlZg==
 SHA512:
   metadata.gz: !binary |-
-    ODRlNjczNzJmZDM1YWU0MzEwOWI3Yzg0ZTVjZTYwMTJmMjY4NjdiMjBhOTc5
-    OGMxZjcwZjgxOTg1NWE4YTZiOGFkYTA0MjRhZGYxZDhjZTc4OTM0YjAxNDM0
-    ZmUzYzUzOTc3MWQ4ZTIxN2QyNDExOThiMjE0OWFlMDI2YzE5NDI=
+    Y2UzZWIxMGI0NGMzYWI4ODFiOWM3YTg5M2MwM2YxMDhhZTg5NDRiY2E5NDJm
+    ZDYyMTI1MDk5NTljMzAzZDVjYzIxYWZhYWM5MTQ2OGQzNDQ5MDgxOWM4MzJk
+    N2I4OTEyMmY0N2IzN2M1OWFiYzM1ZDI4ZjE5M2MyODc0ZGM2NGM=
   data.tar.gz: !binary |-
-    MDRlZGJmM2RkOGM0NTA3YjZmMzE5MzI0M2Q5NjYyZjU3OTVhNjYyNzM3OTlk
-    OWFjYTIzOTVhODk3NTIwZGJjMWIxMjk2ZGM4MDI4NGM3YWE2N2MyZGNjYjJh
-    Y2MwMDM2NDVjMTk2ZDMxMmJmZTFiMWY3OTZiMmJmZWQ3NDVhNGE=
+    YTFmZmI2ZjQ5NjU5MjA3ZjE5M2Q5NWVjYzlkMjY2N2JiOTk4YTIxMTQ0NjEw
+    Njc5YjI2ZTM0NGI4ZjI2NmE3NGU5Mzg3OTA4NjU0YjU5Mzg4NmM3MzYyNTc5
+    MzY3OGUwYTc2YmRlYzcyNjM5ZmExNmViZTVjZWM2MmM3MzFjODI=

data/CHANGELOG.markdown

@@ -1,3 +1,12 @@
+#### v0.3.9
+* Refactored Main Parts of Code
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/57
+
+* Changed Metrics Page, Wrote New Tests, Fixed Little Bugs
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/hubstats/pull/56
+
 #### v0.3.8
 #### v0.3.7
 #### v0.3.6

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

@@ -4,7 +4,7 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
+if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') };
 
 /* ========================================================================
  * Bootstrap: transition.js v3.1.1
@@ -22,32 +22,32 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
   // ============================================================
 
   function transitionEnd() {
-    var el = document.createElement('bootstrap')
+    var el = document.createElement('bootstrap');
 
     var transEndEventNames = {
       'WebkitTransition' : 'webkitTransitionEnd',
       'MozTransition'    : 'transitionend',
       'OTransition'      : 'oTransitionEnd otransitionend',
       'transition'       : 'transitionend'
-    }
+    };
 
     for (var name in transEndEventNames) {
       if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
+        return { end: transEndEventNames[name] };
       }
     }
 
-    return false // explicit for ie8 (  ._.)
+    return false; // explicit for ie8 (  ._.)
   }
 
   // http://blog.alexmaccaw.com/css-transitions
   $.fn.emulateTransitionEnd = function (duration) {
-    var called = false, $el = this
+    var called = false, $el = this;
     $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
+    var callback = function () { if (!called) {$($el).trigger($.support.transition.end)} };
+    setTimeout(callback, duration);
+    return this;
+  };
 
   $(function () {
     $.support.transition = transitionEnd()
@@ -70,71 +70,71 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
   // ALERT CLASS DEFINITION
   // ======================
 
-  var dismiss = '[data-dismiss="alert"]'
+  var dismiss = '[data-dismiss="alert"]';
   var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
+    $(el).on('click', dismiss, this.close);
+  };
 
   Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
+    var $this    = $(this);
+    var selector = $this.attr('data-target');
 
     if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
+      selector = $this.attr('href');
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, ''); // strip for ie7
+    };
 
-    var $parent = $(selector)
+    var $parent = $(selector);
 
-    if (e) e.preventDefault()
+    if (e) {e.preventDefault()};
 
     if (!$parent.length) {
-      $parent = $this.hasClass('alert') ? $this : $this.parent()
-    }
+      $parent = $this.hasClass('alert') ? $this : $this.parent();
+    };
 
-    $parent.trigger(e = $.Event('close.bs.alert'))
+    $parent.trigger(e = $.Event('close.bs.alert'));
 
     if (e.isDefaultPrevented()) return
 
     $parent.removeClass('in')
 
     function removeElement() {
-      $parent.trigger('closed.bs.alert').remove()
-    }
+      $parent.trigger('closed.bs.alert').remove();
+    };
 
     $.support.transition && $parent.hasClass('fade') ?
       $parent
         .one($.support.transition.end, removeElement)
         .emulateTransitionEnd(150) :
-      removeElement()
-  }
+      removeElement();
+  };
 
 
   // ALERT PLUGIN DEFINITION
   // =======================
 
-  var old = $.fn.alert
+  var old = $.fn.alert;
 
   $.fn.alert = function (option) {
     return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
+      var $this = $(this);
+      var data  = $this.data('bs.alert');
 
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
+      if (!data) $this.data('bs.alert', (data = new Alert(this)));
+      if (typeof option === 'string') {data[option].call($this)};
+    });
+  };
 
-  $.fn.alert.Constructor = Alert
+  $.fn.alert.Constructor = Alert;
 
 
   // ALERT NO CONFLICT
   // =================
 
   $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
+    $.fn.alert = old;
+    return this;
+  };
 
 
   // ALERT DATA-API

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

@@ -17,6 +17,11 @@ $(document).ready(function() {
     toggleOrder(queryParameters,$(this).attr('id'));
   });
 
+// No longer using additions and deletions, but instead using net additions
+  $("#netadditions").on("click", function(){
+    toggleOrder(queryParameters,$(this).attr('id'));
+  });
+
   $("#additions").on("click", function(){
     toggleOrder(queryParameters,$(this).attr('id'));
   });
@@ -27,14 +32,14 @@ $(document).ready(function() {
 });
 
 function toggleOrder(queryParams, sort_by) {
-  if (queryParameters["order"] !== undefined) {
-    if (queryParameters["order"] === sort_by+"-desc" ) {
-      updateQueryStringParameter(queryParameters,"order",sort_by+"-asc");
+  if (queryParams["order"] !== undefined) {
+    if (queryParams["order"] === sort_by+"-desc" ) {
+      updateQueryStringParameter(queryParams,"order",sort_by+"-asc");
     } else {
-      updateQueryStringParameter(queryParameters,"order",sort_by+"-desc");
+      updateQueryStringParameter(queryParams,"order",sort_by+"-desc");
     }
   } else {
-    updateQueryStringParameter(queryParameters,"order",sort_by+"-asc");
+    updateQueryStringParameter(queryParams,"order",sort_by+"-asc");
   }
 }
 

data/app/controllers/hubstats/application_controller.rb

@@ -8,6 +8,5 @@ module Hubstats
       cookies[:hubstats_index] ||= 2
       @timespan = TIMESPAN_ARRAY[cookies[:hubstats_index].to_i][:date].ago.to_date
     end
-
   end
 end

data/app/controllers/hubstats/base_controller.rb

@@ -0,0 +1,13 @@
+require_dependency "hubstats/application_controller"
+
+module Hubstats
+  class BaseController < Hubstats::ApplicationController
+    def grouping (group_request, group)
+      if group_request == "user"
+        @groups = group.to_a.group_by(&:user_name)
+      elsif group_request == "repo"
+        @groups = group.to_a.group_by(&:repo_name)
+      end
+    end
+  end
+end

data/app/controllers/hubstats/deploys_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "hubstats/application_controller"
 
 module Hubstats
-  class DeploysController < ApplicationController
+  class DeploysController < Hubstats::BaseController
 
     def index
       # sets to include user and repo, and sorts data
@@ -11,55 +11,24 @@ module Hubstats
         .order_with_timespan(@timespan, params[:order])
         .paginate(:page => params[:page], :per_page => 15)
 
-      # enables grouping by user or repo
-      if params[:group] == "user"
-        @groups = @deploys.to_a.group_by(&:user_name)
-      elsif params[:group] == "repo"
-        @groups = @deploys.to_a.group_by(&:repo_name)
-      end
+      grouping(params[:group], @deploys)
     end
 
     # show basic stats and pull requests from a single deploy
     def show
-      @deploy = Hubstats::Deploy.includes(:repo).includes(:pull_requests).find(params[:id])
+      @deploy = Hubstats::Deploy.includes(:repo, :pull_requests).find(params[:id])
       repo = @deploy.repo
       @pull_requests = @deploy.pull_requests
       pull_request_count = @pull_requests.length
-      net_additions = find_net_additions(@deploy.id)
-      comment_count = find_comment_count(@deploy.id)
       @stats_basics = {
         pull_count: pull_request_count,
-        net_additions: net_additions,
-        comment_count: comment_count
+        net_additions: @deploy.find_net_additions,
+        comment_count: @deploy.find_comment_count,
+        additions: @deploy.total_changes(:additions),
+        deletions: @deploy.total_changes(:deletions)
       }
     end
 
-    # finds all of the additions and deletions in all pull requests and then makes the net additions
-    def find_net_additions(deploy_id)
-      deploy = Hubstats::Deploy.find(deploy_id)
-      pull_requests = deploy.pull_requests
-      total_additions = 0
-      total_deletions = 0
-      pull_requests.each do |pull|
-        total_additions += pull.additions.to_i
-        total_deletions += pull.deletions.to_i
-      end
-      return total_additions - total_deletions
-    end
-
-    # returns the total amount of comments from all pull requests in a deploy
-    def find_comment_count(deploy_id)
-      deploy = Hubstats::Deploy.find(deploy_id)
-      pull_requests = deploy.pull_requests
-      total_comments = 0
-      pull_requests.each do |pull|
-        if pull.comments
-          total_comments += Hubstats::Comment.belonging_to_pull_request(pull.id).includes(:user).created_since(@timespan).count(:all)
-        end
-      end
-      return total_comments
-    end
-
     # make a new deploy with all of the correct attributes
     def create
       if params[:git_revision].nil? || params[:repo_name].nil? || params[:pull_request_ids].nil?
@@ -69,29 +38,22 @@ module Hubstats
         @deploy.deployed_at = params[:deployed_at]
         @deploy.git_revision = params[:git_revision]
         @repo = Hubstats::Repo.where(full_name: params[:repo_name])
-        
-        # Check before assigning the repository
-        if @repo.empty?
+
+        if !valid_repo(@repo)
           render text: "Repository name is invalid.", :status => 400 and return
         else
           @deploy.repo_id = @repo.first.id.to_i
         end
 
-        # Check before assigning the pull requests
         @pull_request_id_array = params[:pull_request_ids].split(",").map {|i| i.strip.to_i}
-        if @pull_request_id_array.empty? || @pull_request_id_array == [0]
+        if !valid_pr_ids
           render text: "No pull request ids given.", :status => 400 and return
         else
           @deploy.pull_requests = Hubstats::PullRequest.where(repo_id: @deploy.repo_id).where(number: @pull_request_id_array)
         end
 
-        # Check before assigning the user_id
-        if @deploy.pull_requests.first.nil?
+        if !valid_pulls
           render text: "Pull requests not valid", :status => 400 and return
-        else
-          if @deploy.pull_requests.first.merged_by
-            @deploy.user_id = @deploy.pull_requests.first.merged_by
-          end
         end
 
         if @deploy.save
@@ -101,5 +63,20 @@ module Hubstats
         end
       end
     end
+
+    def valid_repo(repo)
+      return !repo.empty?
+    end
+
+    def valid_pr_ids
+      return !@pull_request_id_array.empty? && @pull_request_id_array != [0]
+    end
+
+    def valid_pulls
+      pull = @deploy.pull_requests.first
+      return false if pull.nil? || pull.merged_by.nil?
+      @deploy.user_id = pull.merged_by
+      return true
+    end
   end
  end

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "hubstats/application_controller"
 
 module Hubstats
-  class PullRequestsController < ApplicationController
+  class PullRequestsController < Hubstats::BaseController
 
     def index
       URI.decode(params[:label]) if params[:label]
@@ -9,34 +9,30 @@ module Hubstats
       pull_ids = Hubstats::PullRequest
         .belonging_to_users(params[:users])
         .belonging_to_repos(params[:repos])
-        .state_based_order(@timespan,params[:state],"ASC")
         .map(&:id)
 
       @labels = Hubstats::Label.with_a_pull_request(pull_ids).order("pull_request_count DESC")
 
-      @pull_requests = Hubstats::PullRequest.includes(:user).includes(:repo)
+      @pull_requests = Hubstats::PullRequest.includes(:user, :repo)
         .belonging_to_users(params[:users]).belonging_to_repos(params[:repos])
         .group_by(params[:group]).with_label(params[:label])
         .state_based_order(@timespan,params[:state],params[:order])
         .paginate(:page => params[:page], :per_page => 15)
 
-      if params[:group] == 'user'
-        @groups = @pull_requests.to_a.group_by(&:user_name)
-      elsif params[:group] == 'repo'
-        @groups = @pull_requests.to_a.group_by(&:repo_name)
-      end
-
+      grouping(params[:group], @pull_requests)
     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).limit(20)
-      @comment_count = Hubstats::Comment.belonging_to_pull_request(params[:id]).includes(:user).created_since(@timespan).count(:all)
-      @deploys = Hubstats::Deploy.where(id: @pull_request.deploy_id)
+      @comments = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_since(@timespan).limit(20)
+      comment_count = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_since(@timespan).count(:all)
+      @deploys = Hubstats::Deploy.where(id: @pull_request.deploy_id).order("deployed_at DESC")
       @stats_basics = {
-        comment_count: @comment_count,
-        net_additions: @pull_request.additions.to_i - @pull_request.deletions.to_i
+        comment_count: comment_count,
+        net_additions: @pull_request.additions.to_i - @pull_request.deletions.to_i,
+        additions: @pull_request.additions.to_i,
+        deletions: @pull_request.deletions.to_i
       }
     end
 

data/app/controllers/hubstats/repos_controller.rb

@@ -19,40 +19,62 @@ module Hubstats
 
     def show
       @repo = Hubstats::Repo.where(name: params[:repo]).first
-      @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)
-      @deploys = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_since(@timespan).limit(20)
-      @pull_count = Hubstats::PullRequest.belonging_to_repo(@repo.id).updated_since(@timespan).count(:all)
+      @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_since(@timespan).order("updated_at DESC").limit(20)
+      @pull_count = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_since(@timespan).count(:all)
+      @deploys = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_since(@timespan).order("deployed_at DESC").limit(20)
       @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
-      @stats_basics = {
-        user_count: @user_count,
-        deploy_count: @deploy_count,
-        pull_count: @pull_count,
-        comment_count: Hubstats::Comment.belonging_to_repo(@repo.id).created_since(@timespan).count(:all)
-      }
-      @stats_additions = {
-        avg_additions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).belonging_to_repo(@repo.id).average(:deletions).to_i,
-        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
-      }
+      @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)
+      
+      stats
     end
 
     def dashboard
-      @repos = Hubstats::Repo.with_recent_activity(@timespan)
+      if params[:query] ## For select 2.
+        @repos = Hubstats::Repo.where("name LIKE ?", "%#{params[:query]}%").order("name ASC")
+      elsif params[:id]
+        @repos = Hubstats::Repo.where(id: params[:id].split(",")).order("name ASC")
+      else
+        @repos = Hubstats::Repo.with_all_metrics(@timespan)
+          .with_id(params[:repos])
+          .custom_order(params[:order])
+          .paginate(:page => params[:page], :per_page => 15)
+      end
+
       @user_count = Hubstats::User.with_pulls_or_comments(@timespan).only_active.length
+      @deploy_count = Hubstats::Deploy.deployed_since(@timespan).count(:all)
+      @pull_count = Hubstats::PullRequest.merged_since(@timespan).count(:all)
+      @comment_count = Hubstats::Comment.created_since(@timespan).count(:all)
+      @net_additions = Hubstats::PullRequest.merged_since(@timespan).sum(:additions).to_i - 
+                       Hubstats::PullRequest.merged_since(@timespan).sum(:deletions).to_i
+      @additions = Hubstats::PullRequest.merged_since(@timespan).average(:additions)
+      @deletions = Hubstats::PullRequest.merged_since(@timespan).average(:deletions)
+
+      stats
+
+      respond_to do |format|
+        format.html
+        format.json { render :json => @repos}
+      end
+    end
+
+    def stats
+      @additions ||= 0
+      @deletions ||= 0
       @stats_basics = {
         user_count: @user_count,
-        deploy_count: Hubstats::Deploy.count(:all),
-        pull_count: Hubstats::PullRequest.merged_since(@timespan).count(:all),
-        comment_count: Hubstats::Comment.created_since(@timespan).count(:all)
+        deploy_count: @deploy_count,
+        pull_count: @pull_count,
+        comment_count: @comment_count
       }
       @stats_additions = {
-        avg_additions: Hubstats::PullRequest.merged_since(@timespan).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.merged_since(@timespan).average(:deletions).to_i,
-        net_additions: Hubstats::PullRequest.merged_since(@timespan).sum(:additions).to_i - 
-          Hubstats::PullRequest.merged_since(@timespan).sum(:deletions).to_i
+        avg_additions: @additions.round.to_i,
+        avg_deletions: @deletions.round.to_i,
+        net_additions: @net_additions
       }
     end
   end