hubstats 0.0.23 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzJjMjY4ZGFkODdlOTE1ZWUyYjM1MmNmNDYyNzI0NzRjNDJkNWVjYQ==
-  data.tar.gz: !binary |-
-    NjMyOTljYzMzYzFmMmNkZTlkNzc2NTc1MjAyYjVmZGZhNTc4NDAyNA==
+SHA1:
+  metadata.gz: 7f4f31e5446aafe650ec92ff84fb84ae38446309
+  data.tar.gz: 0f4f0430f62ca6c14a3574ec97eaa365debf321a
 SHA512:
-  metadata.gz: !binary |-
-    ZDBiYjUxZDAyNjRlN2MwNzNkNzlhNzM5ZWI2ZmM5MDBjNTVlMTI5ZjFhMzU5
-    NjZmYTNiZGUxNDFhZWQzNmNiYmU4Njc5YWYyMjU1ZTc5OTIyYjJhZWNkNjkw
-    ZTI5Nzc2YzJhYjNjMDk1ODRmZjRiZDQ3NTdjMmViY2Q0Nzc0Yzg=
-  data.tar.gz: !binary |-
-    OGFmNWI3ZWE2ZTJjMWU2MzJjMDc4MDhiZWNiMDlmNWVlNTliNzM4OTY3Yzc1
-    ZDMzNjEyZjU0ZmZiNmFmMDdkMDNjNjQ5NzdjNDRmMjVlMTYzNGQxMGUyMjE5
-    MDBmMTFiNjQ4MTRiNDAwYTY1Yjg1ZDBlMTE1NjQ3NTlmYmViMzA=
+  metadata.gz: 9ffb40c3b610b9f4292a171a062f0b0dfda63a2268c326005be0308900d3739b78dccd75ce17fccfbe8eafde6f0ff83fe14a2b47d87f121895b430e20acb90ed
+  data.tar.gz: efeb154473f4b8a250c3ef3e4907ddeacbe6a03d415893f2c704e02e7a2187e90bfb5ff6fffa449cba97ff3945172e2faff0a727eb68b765ef1cd61ba9851583

data/.gitignore

@@ -9,3 +9,4 @@ test/dummy/db/migrate/*
 .config
 .DS_Store
 .gitkeep
+Gemfile.lock

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

@@ -16,6 +16,10 @@ $(document).ready(function() {
     updateQueryStringParameter(queryParameters,"order",$(this).attr('id'));
   });
 
+  $("#group-by").on("change", function(){
+    updateQueryStringParameter(queryParameters,"group",$(this)[0].value);
+  });
+
   $("#repos").change(function() {
     var ids = $("#repos").val();
     updateQueryStringParameter(queryParameters,"repos",ids);
@@ -53,7 +57,7 @@ function getUrlVars() {
     for (var i = 0; i < hashes.length; i++) {
       hash = hashes[i].split('=');
       vars.push(hash[0]);
-      vars[hash[0]] = hash[1];
+      vars[hash[0]] = hash[1].replace(/%20/g,' ').replace(/%2C/g,',');
     }
   }
 
@@ -70,11 +74,14 @@ function setDefaults(queryParameters) {
     $('#' + queryParameters["order"]).addClass('active');
   else
     $('#desc').addClass('active');
+
+  if (queryParameters["group"])
+    $('#group-by').val(queryParameters["group"]);
 }
 
 function initLabels (queryParameters) {
   if (queryParameters["label"]) {
-    var labels = queryParameters["label"].replace('%20',' ').split(',');
+    var labels = queryParameters["label"].split(',');
 
     $("#labels-container .btn-label").each( function() {
       var color = '#' + $(this).data("color");

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

@@ -6,7 +6,7 @@ $(document).ready(function() {
     placeholder: "Repositories",
     multiple: true,
     ajax: {
-      url: "./repos",
+      url: getPath("repo"),
       dataType: 'json',
       quietMillis: 100,
       data: function (term) {
@@ -27,7 +27,7 @@ $(document).ready(function() {
     },
     initSelection: function(element, callback) {
       if (reposIDs !== "") {
-        $.ajax("./repos", {
+        $.ajax(getPath("repo"), {
           data: { id: reposIDs },
           dataType: "json"
         }).done(function (data) { callback(
@@ -48,7 +48,7 @@ $(document).ready(function() {
     placeholder: "Users",
     multiple: true,
     ajax: {
-      url: "./users",
+      url: getPath("user"),
       dataType: 'json',
       quietMillis: 100,
       data: function (term) {
@@ -69,7 +69,7 @@ $(document).ready(function() {
     },
     initSelection: function(element, callback) {
       if (usersIDs !== "") {
-        $.ajax("./users", {
+        $.ajax( getPath("user"), {
           data: { id: usersIDs },
           dataType: "json"
         }).done(function (data) { callback(
@@ -84,5 +84,12 @@ $(document).ready(function() {
       }
     } 
   }).select2('val', []);
+});
 
-});
+
+function getPath (model) {
+  if (model == 'user') {
+    return $("#brand").attr('data-user-path');}
+  else if (model == 'repo')
+    return $("#brand").attr('data-repo-path');
+};

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

@@ -89,6 +89,13 @@
   border-bottom: 1px solid #ccc;
 }
 
+.single-pull.group-header {
+  padding: 10px;
+  background-color: #F5F5F5;
+}
+.group-header > h3{
+  margin: 0px;
+}
 .comment-info > .well {
   word-wrap: break-word;
   padding: 10px;

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -6,19 +6,26 @@ module Hubstats
     def index
       URI.decode(params[:label]) if params[:label]
 
-      @pull_requests = Hubstats::PullRequest
+      pull_ids = Hubstats::PullRequest
         .belonging_to_users(params[:users])
         .belonging_to_repos(params[:repos])
         .with_state(params[:state])
-        .state_based_order(@timespan,params[:state],params[:order])
-
-      pull_ids =@pull_requests.map(&:id)
+        .map(&:id)
       
       @labels = Hubstats::Label.with_a_pull_request(pull_ids).order("pull_request_count DESC")
-      @pull_requests = @pull_requests
-        .includes(:user).includes(:repo)
-        .with_label(params[:label]).distinct
+
+      @pull_requests = Hubstats::PullRequest.includes(:user).includes(: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
+
     end 
 
     def show

data/app/models/hubstats/label.rb

@@ -9,7 +9,7 @@ module Hubstats
       .group("hubstats_labels.id")
     }
 
-    scope :with_ids, lambda { |pull_ids| (where("hubstats_labels_pull_requests.pull_request_id" => pull_ids)) unless pull_ids.blank? }
+    scope :with_ids, lambda { |pull_ids| (where("hubstats_labels_pull_requests.pull_request_id" => pull_ids)) }
 
     scope :with_state, lambda {|state| (where(state: state) unless state == 'all') if state}
 

data/app/models/hubstats/pull_request.rb

@@ -1,16 +1,18 @@
 module Hubstats
   class PullRequest < ActiveRecord::Base
-
     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 :opened_since, lambda {|time| where("hubstats_pull_requests.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 :group, lambda {|group| group_by(:repo_id) if group }
     scope :with_state, lambda {|state| (where(state: state) unless state == 'all') if state}
     scope :with_label, lambda { |label_name| ({ :joins => :labels, :conditions => {:hubstats_labels => {name: label_name.split(',')} } }) if label_name }
     scope :distinct, select("DISTINCT hubstats_pull_requests.*")
+    scope :with_repo_name, select('DISTINCT hubstats_repos.name as repo_name, hubstats_pull_requests.*').joins("LEFT JOIN hubstats_repos ON hubstats_repos.id = hubstats_pull_requests.repo_id")
+    scope :with_user_name, select('DISTINCT hubstats_users.login as user_name, hubstats_pull_requests.*').joins("LEFT JOIN hubstats_users ON hubstats_users.id = hubstats_pull_requests.user_id")
 
     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,
@@ -46,11 +48,20 @@ module Hubstats
 
     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}")
+        with_state(state).closed_since(timespan).order("hubstats_pull_requests.closed_at #{order}")
+      else
+        with_state(state).opened_since(timespan).order("hubstats_pull_requests.created_at #{order}")
+      end
+    end
+
+    def self.group_by(group)
+      if group == 'user'
+        with_user_name.order("user_name ASC")
+      elsif group == 'repo'
+        with_repo_name.order("repo_name asc")
       else
-        opened_since(timespan).order("created_at #{order}")
+        scoped
       end
     end
 

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

@@ -9,7 +9,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand title" href="/">Hubstats</a>
+        <%= link_to "Hubstats", root_path, {:data => {:repo_path => repos_path(), :user_path => users_path()}, :class => "navbar-brand title", :id =>"brand"} %>
       </div>
 
       <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

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

@@ -47,11 +47,16 @@
         </label>
       </div>
 
-      <%= render 'hubstats/tables/pulls' %>
-  
+      <select id="group-by" class="form-control pull-right" style="width: 100px; display: inline; ">
+        <option value="">Group By</option>
+        <option value="user">User</option>
+        <option value="repo">Repo</option>
+      </select>
 
+      <%= render 'hubstats/tables/grouped_pulls' %>
+  
       <div class="text-center">
-        <%= will_paginate @posts, renderer: BootstrapPagination::Rails %>
+        <%= will_paginate @pull_requests, renderer: BootstrapPagination::Rails %>
       </div>
 
     </div>

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

@@ -0,0 +1,17 @@
+<% if @pull_requests.length > 0 %>
+  <% if @groups %>
+      <% @groups.each do |group| %>
+        <div class="pulls">
+          <div class="row single-pull group-header">
+            <h3> <%= group[0] %> </h3>
+          </div>
+          <%= render partial: 'hubstats/partials/pull', collection: group[1], as: :pull %>
+        </div>
+      <% end %>
+  <% else %>
+    <%= render 'hubstats/tables/pulls' %>
+  <% end %>
+<% else %>
+  <p> No pull requests to show </p>
+<% end %>
+

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.0.23"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.1.0
 platform: ruby
 authors:
 - Elliot Hursh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Github Statistics
@@ -129,12 +129,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .automation.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".automation.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -188,6 +187,7 @@ files:
 - app/views/hubstats/repos/show.html.erb
 - app/views/hubstats/tables/_comments-condensed.html.erb
 - app/views/hubstats/tables/_comments.html.erb
+- app/views/hubstats/tables/_grouped_pulls.html.erb
 - app/views/hubstats/tables/_pulls-condensed.html.erb
 - app/views/hubstats/tables/_pulls.html.erb
 - app/views/hubstats/tables/_repos-condensed.html.erb
@@ -282,12 +282,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/Gemfile.lock

@@ -1,144 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hubstats (0.0.20)
-      octokit (~> 3.2)
-      rails (~> 3.2.18)
-      select2-rails (~> 3.5)
-      will_paginate-bootstrap
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
-      mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.6)
-    arel (3.0.3)
-    builder (3.0.4)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    factory_girl (4.4.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
-      railties (>= 3.0.0)
-    faker (1.4.1)
-      i18n (~> 0.5)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    hike (1.2.3)
-    i18n (0.6.11)
-    journey (1.0.4)
-    jquery-rails (3.1.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    mysql2 (0.3.16)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
-      bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-rails (3.0.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    select2-rails (3.5.9)
-      thor (~> 0.14)
-    shoulda-matchers (2.6.1)
-      activesupport (>= 3.0.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.40)
-    will_paginate (3.0.7)
-    will_paginate-bootstrap (1.0.1)
-      will_paginate (>= 3.0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  factory_girl_rails (~> 4.4)
-  faker (~> 1.3)
-  hubstats!
-  jquery-rails
-  mysql2
-  rspec-rails (~> 3.0.0.beta)
-  shoulda-matchers (~> 2.6)