hubstats 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmUzYjI5MzkzYWQxMDk0MTIxNGMyZjI5MGZiYTY3M2U3MjM3ZDlhZg==
+    Yzc2MzJjMGI0ZDJkNDM1MTY5YTY4MjZkMGRhNGE4NzFhY2I2MGZkOQ==
   data.tar.gz: !binary |-
-    NDFlNTIwYjY2ZmQyY2M0Y2VlMjlmZWJkNTJkMDlmYzExNDM0NDBlYg==
+    NjQ2YzQ0ODgyOWNmYjk2ZjA2MjNlMTNlYjMyY2ZiZjZhZWJjZTBlMQ==
 SHA512:
   metadata.gz: !binary |-
-    ODM3NTBjNDViYWE5OGJlMmEzOGU1MDkwZDE5OTQ5NTdjMDJlZDYxY2YzN2Y4
-    MzYzOWY2ZmEzYTRmZGFiZTE1MzZkMzdhYTExOTk5MTFmNWI4MDc5YzU5NzAz
-    MDU4OGVmMjFlNTRlNDMxMzZlYmVmZDc2M2QyZjI1MDMzOWUzMzE=
+    YTIxMzE2Y2QwNWFhMTI2MTlhZGE4NTA2YzIxMDBjYjViZWZjNGVkYzc2Y2Mw
+    MDE3NjMyMGJhOTg0OWQxM2I1YzU1NjFkMjE0YTI0MGM0MTk4N2Y1OWIwMWM3
+    YzI4YmE5MDUwMDUzYmI1MDFiY2VmZDg2NjIxMDQ2MmRhNWU2Y2I=
   data.tar.gz: !binary |-
-    MDEzNDMyZDY1NGE2N2JlODc2OTE3ZTIxMzA4ZDdiMmRkNGU2ZWIyOGIzY2M3
-    OTU5MTg1ZjQ5YjRmY2MzNjI1ZTRkMmViNDBjNzM3YjBhZDM4MDAyYWIyZDZh
-    MzM5NjkxNDY0ODdiNjM2NWUxNDU1NzJiYjkxMzRjNjBhZTA4NTQ=
+    NDdhMjdiYjBjZWJmNWMyNDJiYTVhMzQxYzIxZjliMWRhMmNhZDgwMzFkMTZk
+    MzM0MWM5MjUyNjA3ZTRhOTVlMzdlYTVkNWU0NzBmNWMwZjNhOWQ1MDM4ZDAw
+    ZDRkZmU5NTY1YjQ5MjMyMjhkYjgxZjllZGM5YmE4NDFkOWE3Y2I=

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

@@ -12,20 +12,25 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require select2
 //= require hubstats/bootstrap
 //= require_tree .
 
 
-window.onload = function () {
+$(document).ready( function() {
+  setTimespan()
+});
+
+function setTimespan() {
   var index = readCookie("hubstats_index") || 2;
   var timer = document.getElementById("time-select");
 
   timer.selectedIndex = index;
 
   timer.onchange = function() {
-    var url = [location.protocol, '//', location.host, location.pathname].join('');
+
     createCookie("hubstats_index",this.selectedIndex,1);
-    window.location = url;
+    window.location.reload();
   };
 }
 

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

@@ -1,2 +1,161 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
+
+$(document).ready(function() {
+  queryParameters = getUrlVars();
+  setDefaults(queryParameters);
+
+  $("#state-group > .btn").on("click", function(){
+    updateQueryStringParameter(queryParameters,"state",$(this).attr('id'));
+  });
+
+  $("#sort-group > .btn").on("click", function(){
+    updateQueryStringParameter(queryParameters,"order",$(this).attr('id'));
+  });
+
+  $("#repos").change(function() {
+    var ids = $("#repos").val();
+    updateQueryStringParameter(queryParameters,"repos",ids);
+  });
+  
+  $("#users").change(function() {
+    var ids = $("#users").val();
+    updateQueryStringParameter(queryParameters,"users",ids);
+  });
+});
+
+
+function updateQueryStringParameter(queryParameters, key, value) {
+  var uri = document.location.pathname;
+  if (!queryParameters[key])
+    queryParameters.push(key)
+  queryParameters[key] = value;
+
+  var i;
+  for (i = 0; i < queryParameters.length; i++) {
+    var separator = uri.indexOf('?') !== -1 ? "&" : "?";
+    var value = queryParameters[i];
+    if (queryParameters[value].length >= 1)
+      uri = (uri + separator + value + '=' + queryParameters[value]);
+  }
+
+  document.location.href = uri
+}
+
+function getUrlVars() {
+  var vars = [], hash;
+  if (window.location.href.indexOf('?') > 0) {
+    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+
+    for (var i = 0; i < hashes.length; i++) {
+      hash = hashes[i].split('=');
+      vars.push(hash[0]);
+      vars[hash[0]] = hash[1];
+    }
+  }
+
+  return vars;
+}
+
+function setDefaults(queryParameters) {
+  if (queryParameters["state"])
+    $('#' + queryParameters["state"]).addClass('active');
+  else 
+    $('#all').addClass('active');
+
+  if (queryParameters["order"])
+    $('#' + queryParameters["order"]).addClass('active');
+  else
+    $('#desc').addClass('active');
+}
+
+
+
+$(document).ready(function() { 
+  usersIDs = queryParameters["users"] ? queryParameters["users"].replace("%2C", ",") : "";
+  reposIDs = queryParameters["repos"] ? queryParameters["repos"].replace("%2C", ",") : "";
+
+  $("#repos").select2({
+    placeholder: "Repositories",
+    multiple: true,
+    ajax: {
+      url: "./repos",
+      dataType: 'json',
+      quietMillis: 100,
+      data: function (term) {
+        return {
+          query: term
+        };
+      },
+      results: function (data) {
+        return {
+          results: $.map(data, function (repo) {
+            return {
+              text: repo.name,
+              id: repo.id
+            }
+          })
+        };
+      }
+    },
+    initSelection: function(element, callback) {
+      if (reposIDs !== "") {
+        $.ajax("./repos", {
+          data: { id: reposIDs },
+          dataType: "json"
+        }).done(function (data) { callback(
+            $.map(data, function (repo) {
+              return {
+                text: repo.name,
+                id: repo.id
+              }
+            })
+          ); 
+        });
+      }
+    }
+  }).select2('val', []); 
+
+
+  $("#users").select2({
+    placeholder: "Users",
+    multiple: true,
+    ajax: {
+      url: "./users",
+      dataType: 'json',
+      quietMillis: 100,
+      data: function (term) {
+        return {
+          query: term
+        };
+      },
+      results: function (data) {
+        return {
+          results: $.map(data, function (user) {
+            return {
+              text: user.login,
+              id: user.id
+            }
+          })
+        };
+      }
+    },
+    initSelection: function(element, callback) {
+      if (usersIDs !== "") {
+        $.ajax("./users", {
+          data: { id: usersIDs },
+          dataType: "json"
+        }).done(function (data) { callback(
+            $.map(data, function (user) {
+              return {
+                text: user.login,
+                id: user.id
+              }
+            })
+          ); 
+        });
+      }
+    } 
+  }).select2('val', []);
+
+});

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

@@ -10,6 +10,8 @@
  *
  *= require_self
  *= require hubstats/bootstrap
+ *= require select2
+ *= require select2-bootstrap
  *= require_tree .
  */
 
@@ -24,4 +26,49 @@
 
 #header .title {
   font-size: 28px;
+}
+
+.single-comment > .user-image, .single-pull > .user-image {
+  padding: 5px;
+}
+
+.user-image > img{
+  width: 55px;
+  height: 55px;
+}
+
+.pulls, .comments {
+  margin: 15px 0px 15px 0px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+
+.pulls > .col, .comments > .col {
+  padding: 0px 5px 0px 5px;
+}
+
+.row .single-pull, .row .single-comment {
+  padding:5px;
+  margin: 0px;
+  border-bottom: 1px solid #ccc;
+}
+
+.comment-info > .well {
+  padding: 10px;
+  margin-bottom: 5px;
+}
+
+.single-pull > .pull-info {
+  padding: 0px;
+}
+.pull-info > h4 {
+  margin: 0px;
+}
+
+.push-down {
+  margin-top: 8px;
+}
+
+.push-down-farther {
+ margin-top: 15px;
 }

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

@@ -2,3 +2,6 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+.select2-container{
+  width: 100%;
+}

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -4,16 +4,33 @@ module Hubstats
   class PullRequestsController < ApplicationController
 
     def index
+      @pull_requests = Hubstats::PullRequest.includes(:user).includes(:repo)
+        .belonging_to_users(params[:users])
+        .belonging_to_repos(params[:repos])
+        .with_state(params[:state])
+        .state_based_order(@timespan,params[:state],params[:order])
+        .paginate(:page => params[:page], :per_page => 15)
+        
+      @labels = Hubstats::Label.with_a_pull_request
+    end 
+
+    def repo_index
       @repo = Hubstats::Repo.where(name: params[:repo]).first
-      @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).closed_since(@timespan)
+      @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).closed_since(@timespan).order("closed_at DESC")
     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)
+      @stats = {
+        github: @pull_request.html_url,
+        comment_count: @comments.count(:all),
+        additions: @pull_request.additions.to_i,
+        deletions: @pull_request.deletions.to_i,
+        net_additions: @pull_request.additions.to_i - @pull_request.deletions.to_i
+      }
     end
 
   end
-
 end

data/app/controllers/hubstats/repos_controller.rb

@@ -2,17 +2,20 @@ require_dependency "hubstats/application_controller"
 
 module Hubstats
   class ReposController < ApplicationController
+
     def index
-      @repos = Hubstats::Repo.with_recent_activity(@timespan).limit(20)
-      @users = Hubstats::User.with_pulls_or_comments(@timespan).only_active.limit(20)
-      @stats = {
-        user_count: Hubstats::User.with_pulls_or_comments(@timespan).only_active.length,
-        pull_count: Hubstats::PullRequest.closed_since(@timespan).count(:all),
-        comment_count: Hubstats::Comment.created_since(@timespan).count(:all),
-        avg_additions: Hubstats::PullRequest.closed_since(@timespan).average(:additions).to_i,
-        avg_deletions: Hubstats::PullRequest.closed_since(@timespan).average(:deletions).to_i,
-        net_additions: Hubstats::PullRequest.closed_since(@timespan).sum(:additions).to_i - Hubstats::PullRequest.closed_since(@timespan).sum(:deletions).to_i
-      }
+      if params[:query]
+        @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_recent_activity(@timespan)
+      end
+
+      respond_to do |format|
+        format.html # show.html.erb
+        format.json { render :json => @repos}
+      end
     end
 
     def show
@@ -28,5 +31,19 @@ module Hubstats
         net_additions: Hubstats::PullRequest.closed_since(@timespan).belonging_to_repo(@repo.id).sum(:additions).to_i - Hubstats::PullRequest.closed_since(@timespan).belonging_to_repo(@repo.id).sum(:deletions).to_i
       }
     end
+
+    def dashboard
+      @repos = Hubstats::Repo.with_recent_activity(@timespan).limit(20)
+      @users = Hubstats::User.with_pulls_or_comments(@timespan).only_active.limit(20)
+      @repo_count = Hubstats::Repo.with_recent_activity(@timespan).count(:all)
+      @user_count = Hubstats::User.with_pulls_or_comments(@timespan).only_active.length
+      @stats = {
+        user_count: @user_count,
+        pull_count: Hubstats::PullRequest.closed_since(@timespan).count(:all),
+        comment_count: Hubstats::Comment.created_since(@timespan).count(:all),
+        avg_additions: Hubstats::PullRequest.closed_since(@timespan).average(:additions).to_i,
+        avg_deletions: Hubstats::PullRequest.closed_since(@timespan).average(:deletions).to_i
+      }
+    end
   end
 end

data/app/controllers/hubstats/users_controller.rb

@@ -4,7 +4,18 @@ module Hubstats
   class UsersController < ApplicationController
 
     def index 
-      @users = Hubstats::User.with_pulls_or_comments(@timespan)
+      if params[:query]
+        @users = Hubstats::User.where("login LIKE ?", "%#{params[:query]}%").order("login ASC")
+      elsif params[:id]
+        @users = Hubstats::User.where(id: params[:id].split(",")).order("login ASC")
+      else
+        @users = Hubstats::User.with_pulls_or_comments(@timespan)
+      end
+      
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render :json => @users}
+      end
     end
 
     def show

data/app/models/hubstats/label.rb

@@ -0,0 +1,15 @@
+module Hubstats
+  class Label < ActiveRecord::Base
+    scope :with_a_pull_request, lambda {
+      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")
+      .having("pull_request_count > 0")
+      .group("hubstats_labels.id")
+    }
+
+    attr_accessible :url, :name, :color
+
+    has_and_belongs_to_many :pull_requests, :join_table => 'hubstats_labels_pull_requests'
+  end
+end

data/app/models/hubstats/pull_request.rb

@@ -1,32 +1,54 @@
 module Hubstats
   class PullRequest < ActiveRecord::Base
 
-    scope :closed_since, lambda {|time| where("closed_at > ?", time).order("closed_at DESC") }
+    scope :closed_since, lambda {|time| where("closed_at > ?", time) }
+    scope :updated_since, lambda {|time| where("updated_at > ?", time) }
+    scope :opened_since, lambda {|time| where("created_at > ?", time) }
     scope :belonging_to_repo, lambda {|repo_id| where(repo_id: repo_id)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}
-    
+    scope :belonging_to_repos, lambda {|repo_id| where(repo_id: repo_id.split(',')) if repo_id}
+    scope :belonging_to_users, lambda {|user_id| where(user_id: user_id.split(',')) if user_id}
+    scope :with_state, lambda {|state| (where(state: state) unless state == 'all') if state}
+
     attr_accessible :id, :url, :html_url, :diff_url, :patch_url, :issue_url, :commits_url,
       :review_comments_url, :review_comment_url, :comments_url, :statuses_url, :number,
       :state, :title, :body, :created_at, :updated_at, :closed_at, :merged_at, 
       :merge_commit_sha, :merged, :mergeable, :comments, :commits, :additions,
       :deletions, :changed_files, :user_id, :repo_id
 
-      belongs_to :user
-      belongs_to :repo
+    belongs_to :user
+    belongs_to :repo
+    has_and_belongs_to_many :labels, :join_table => 'hubstats_labels_pull_requests'
+
+    def self.create_or_update(github_pull)
+      github_pull = github_pull.to_h if github_pull.respond_to? :to_h
+
+      user = Hubstats::User.create_or_update(github_pull[:user])
+      github_pull[:user_id] = user.id
+      repo = Hubstats::Repo.create_or_update(github_pull[:repository])
+      github_pull[:repo_id] = repo.id
 
-      def self.create_or_update(github_pull)
-        github_pull = github_pull.to_h if github_pull.respond_to? :to_h
+      pull_data = github_pull.slice(*column_names.map(&:to_sym))
 
-        user = Hubstats::User.create_or_update(github_pull[:user])
-        github_pull[:user_id] = user.id
-        repo = Hubstats::Repo.create_or_update(github_pull[:repository])
-        github_pull[:repo_id] = repo.id
+      pull = where(:id => pull_data[:id]).first_or_create(pull_data)
+      return pull if pull.update_attributes(pull_data)
+      Rails.logger.debug pull.errors.inspect
+    end
 
-        pull_data = github_pull.slice(*column_names.map(&:to_sym))
+    def add_labels(labels)
+      labels.map!{|v| Hubstats::Label.where(name: v.name).first}
+      self.labels = labels
+    end
 
-        pull = where(:id => pull_data[:id]).first_or_create(pull_data)
-        return pull if pull.update_attributes(pull_data)
-        Rails.logger.debug pull.errors.inspect
+    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"
+        closed_since(timespan).order("closed_at #{order}")
+      else
+        opened_since(timespan).order("created_at #{order}")
       end
+    end
+
   end
 end