hubstats 0.3.13 → 0.3.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDAxN2M4MjI1MTU0NjMyNGIxZjJmZDUxZTExNTY0ZmRjMDU3ZmJkYw==
+    MTU5NGI4YWFlZjBjMTUzOTEwMjk3NDExMDU4OTk2MjM3OTQ4NmYzMQ==
   data.tar.gz: !binary |-
-    NTVhOWIzOTcyYzgzYzA4YzU4ZDY2OGRhZTE4NzBjNTJiZGVmMjRjOQ==
+    NTFmYjkwNjdmMmU5MDUwYjA3MmI1ZDA4OTNkMTJjZTgyNGEyMGMzOA==
 SHA512:
   metadata.gz: !binary |-
-    YmZjMTQ3MmQ5OGJmMzc1OGRiMDNjYTg1YTdlZGMyODFmNzI5ODU3Y2YyMzA3
-    MmY4YzNiNGMzMDcyNGQ3MGNiNGQ0ZTg1NGFmNTVhZmRhMjY3NGM0ODBjMWIz
-    OWE1MWI4MTQ3Y2ZhOGVhMmQ5NzkyZGFhOTUwMWZiYWQwOGE0YzQ=
+    MjIxMjNmMmJlNmRhNGZkZWZjZDc5MDI4ZjlkZTMwMmU5MzllYjE3YmZjNGM1
+    MWZhMDBjN2U1NWE5MDk0OGZhOTk1NDJmZGY3OTA5ZDQ1MDEyNzQwMTM5YWFi
+    OWIyMDQzNGIwNGExZDJjZmZhNmQxNjA2NDY5MDY3NzI3ZWVhOWU=
   data.tar.gz: !binary |-
-    YmMyOThlM2M5NTg1YTA1MjJkODczNmQ5MWZkMjM0MDcxNzY1ODRlYTlmZDA0
-    OTYxMDNlYjJiMTQzNjUwODQ1NWU4Nzg5MjcwOWIyMzdiNzIwNDhhMjcwM2E0
-    OTdlNTY5OTY4NTQ5ZDhmZTIzYzQzNmVmZTNlYzBjOGIzZjM0Nzk=
+    NWEzNGI2NWRlNThlMzBkMGNjM2M5MTYwMWNjMTMxMGQwYmI0MWY3ZjZiMGM0
+    ZjQwOTY4YmFkMDJmZTZhMzg1ZjFlMTM3NWNhOWQyZDBiZjI4NjcxN2NkYmY5
+    ODZhYTQzZTViNjMxMTlhZDExYWJjYWQ3MTVmMTBiODUyYTQ1NjU=

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v0.3.14
+* Replacing timespan with a start date and an end date
+
+  > Emma Sax: Andy Fleener: https://github.com/sportngin/hubstats/pull/65
+
 #### v0.3.13
 * Adding the nagivation bar highlights
 

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 # jquery-rails is used by the dummy application
 gem "jquery-rails"
 gem "mysql2"
+gem "bootstrap-datepicker-rails"
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing

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

@@ -14,21 +14,20 @@
 //= require jquery_ujs
 //= require select2
 //= require hubstats/bootstrap
+//= require bootstrap-datepicker
 //= require_tree .
 
-
 $(document).ready( function() {
-  setTimespan()
+  setDateRange()
 });
 
-function setTimespan() {
+function setDateRange() {
   var index = readCookie("hubstats_index") || 2;
   var timer = document.getElementById("time-select");
 
   timer.selectedIndex = index;
 
   timer.onchange = function() {
-
     createCookie("hubstats_index",this.selectedIndex,1);
     window.location.reload();
   };

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

@@ -12,10 +12,10 @@
  *= require hubstats/bootstrap
  *= require select2
  *= require select2-bootstrap
+ *= require bootstrap-datepicker
  *= require_tree .
  */
 
-
 .numeric, .title {
   text-align: center;
 }

data/app/controllers/hubstats/application_controller.rb

@@ -6,7 +6,8 @@ module Hubstats
     private
     def set_time
       cookies[:hubstats_index] ||= 2
-      @timespan = TIMESPAN_ARRAY[cookies[:hubstats_index].to_i][:date].ago.to_date
+      @start_date = DATE_RANGE_ARRAY[cookies[:hubstats_index].to_i][:date].ago.to_date
+      @end_date = Date.today
     end
   end
 end

data/app/controllers/hubstats/deploys_controller.rb

@@ -8,7 +8,7 @@ module Hubstats
       @deploys = Hubstats::Deploy.includes(:repo, :pull_requests, :user)
         .belonging_to_users(params[:users]).belonging_to_repos(params[:repos])
         .group_by(params[:group])
-        .order_with_timespan(@timespan, params[:order])
+        .order_with_date_range(@start_date, @end_date, params[:order])
         .paginate(:page => params[:page], :per_page => 15)
 
       grouping(params[:group], @deploys)

data/app/controllers/hubstats/pull_requests_controller.rb

@@ -6,13 +6,13 @@ module Hubstats
     def index
       URI.decode(params[:label]) if params[:label]
 
-      pull_requests = PullRequest.all_filtered(params, @timespan)
+      pull_requests = PullRequest.all_filtered(params, @start_date, @end_date)
       @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])
         .group_by(params[:group]).with_label(params[:label])
-        .state_based_order(@timespan,params[:state],params[:order])
+        .state_based_order(@start_date, @end_date, params[:state], params[:order])
         .paginate(:page => params[:page], :per_page => 15)
 
       grouping(params[:group], @pull_requests)
@@ -21,9 +21,10 @@ module Hubstats
     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]).created_since(@timespan).limit(20)
-      comment_count = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_since(@timespan).count(:all)
+      @comments = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_in_date_range(@start_date, @end_date).limit(20)
+      comment_count = Hubstats::Comment.belonging_to_pull_request(params[:id]).created_in_date_range(@start_date, @end_date).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,

data/app/controllers/hubstats/repos_controller.rb

@@ -4,12 +4,12 @@ module Hubstats
   class ReposController < ApplicationController
 
     def index
-      if params[:query]
+      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_recent_activity(@timespan)
+        @repos = Hubstats::Repo.with_recent_activity(@start_date, @end_date)
       end
 
       respond_to do |format|
@@ -19,40 +19,40 @@ module Hubstats
 
     def show
       @repo = Hubstats::Repo.where(name: params[:repo]).first
-      @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
-      @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)
-      
+      @pull_requests = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_in_date_range(@start_date, @end_date).order("updated_at DESC").limit(20)
+      @pull_count = Hubstats::PullRequest.belonging_to_repo(@repo.id).merged_in_date_range(@start_date, @end_date).count(:all)
+      @deploys = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_in_date_range(@start_date, @end_date).order("deployed_at DESC").limit(20)
+      @deploy_count = Hubstats::Deploy.belonging_to_repo(@repo.id).deployed_in_date_range(@start_date, @end_date).count(:all)
+      @comment_count = Hubstats::Comment.belonging_to_repo(@repo.id).created_in_date_range(@start_date, @end_date).count(:all)
+      @user_count = Hubstats::User.with_pulls_or_comments(@start_date, @end_date, @repo.id).only_active.length
+      @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).sum(:additions).to_i -
+                       Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).sum(:deletions).to_i
+      @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).average(:additions)
+      @deletions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_repo(@repo.id).average(:deletions)      
+
       stats
     end
 
     def dashboard
-      if params[:query] ## For select 2.
+      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)
+        @repos = Hubstats::Repo.with_all_metrics(@start_date, @end_date)
           .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)
+      @user_count = Hubstats::User.with_pulls_or_comments(@start_date, @end_date).only_active.length
+      @deploy_count = Hubstats::Deploy.deployed_in_date_range(@start_date, @end_date).count(:all)
+      @pull_count = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).count(:all)
+      @comment_count = Hubstats::Comment.created_in_date_range(@start_date, @end_date).count(:all)
+      @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).sum(:additions).to_i - 
+                       Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).sum(:deletions).to_i
+      @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).average(:additions)
+      @deletions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).average(:deletions)
 
       stats
 

data/app/controllers/hubstats/users_controller.rb

@@ -9,7 +9,7 @@ module Hubstats
       elsif params[:id]
         @users = Hubstats::User.where(id: params[:id].split(",")).order("login ASC")
       else
-        @users = Hubstats::User.only_active.with_all_metrics(@timespan)
+        @users = Hubstats::User.only_active.with_all_metrics(@start_date, @end_date)
             .with_id(params[:users])
             .custom_order(params[:order])
             .paginate(:page => params[:page], :per_page => 15)
@@ -23,15 +23,15 @@ module Hubstats
 
     def show
       @user = Hubstats::User.where(login: params[:id]).first
-      @pull_requests = Hubstats::PullRequest.belonging_to_user(@user.id).merged_since(@timespan).order("updated_at DESC").limit(20)
-      @pull_count = Hubstats::PullRequest.belonging_to_user(@user.id).merged_since(@timespan).count(:all)
-      @deploys = Hubstats::Deploy.belonging_to_user(@user.id).deployed_since(@timespan).order("deployed_at DESC").limit(20)
-      @deploy_count = Hubstats::Deploy.belonging_to_user(@user.id).deployed_since(@timespan).count(:all)
-      @comment_count = Hubstats::Comment.belonging_to_user(@user.id).created_since(@timespan).count(:all)
-      @net_additions = Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).sum(:additions).to_i -
-                       Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).sum(:deletions).to_i
-      @additions = Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).average(:additions)
-      @deletions = Hubstats::PullRequest.merged_since(@timespan).belonging_to_user(@user.id).average(:deletions)
+      @pull_requests = Hubstats::PullRequest.belonging_to_user(@user.id).merged_in_date_range(@start_date, @end_date).order("updated_at DESC").limit(20)
+      @pull_count = Hubstats::PullRequest.belonging_to_user(@user.id).merged_in_date_range(@start_date, @end_date).count(:all)
+      @deploys = Hubstats::Deploy.belonging_to_user(@user.id).deployed_in_date_range(@start_date, @end_date).order("deployed_at DESC").limit(20)
+      @deploy_count = Hubstats::Deploy.belonging_to_user(@user.id).deployed_in_date_range(@start_date, @end_date).count(:all)
+      @comment_count = Hubstats::Comment.belonging_to_user(@user.id).created_in_date_range(@start_date, @end_date).count(:all)
+      @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_user(@user.id).sum(:additions).to_i -
+                       Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_user(@user.id).sum(:deletions).to_i
+      @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_user(@user.id).average(:additions)
+      @deletions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_user(@user.id).average(:deletions)
 
       stats
     end

data/app/models/hubstats/comment.rb

@@ -8,7 +8,7 @@ module Hubstats
       .group("hubstats_comments.user_id")
     }
 
-    scope :created_since, lambda {|time| where("created_at > ?", time) }
+    scope :created_in_date_range, lambda {|start_date, end_date| where("hubstats_comments.created_at BETWEEN ? AND ?", start_date, end_date)}
     scope :belonging_to_pull_request, lambda {|pull_request_id| where(pull_request_id: pull_request_id)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}
     scope :belonging_to_repo, lambda {|repo_id| where(repo_id: repo_id)}

data/app/models/hubstats/deploy.rb

@@ -8,13 +8,12 @@ module Hubstats
         self.deployed_at = Time.now.getutc if deployed_at.nil?
     end
 
-    scope :deployed_since, lambda {|time| where("hubstats_deploys.deployed_at > ?", time)}
+    scope :deployed_in_date_range, lambda {|start_date, end_date| where("hubstats_deploys.deployed_at BETWEEN ? AND ?", start_date, end_date)}
     scope :group, lambda {|group| group_by(:repo_id) if group }
     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 :order_with_timespan
     scope :with_repo_name, select('DISTINCT hubstats_repos.name as repo_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_repos ON hubstats_repos.id = hubstats_deploys.repo_id")
     scope :with_user_name, select('DISTINCT hubstats_users.login as user_name, hubstats_deploys.*').joins("LEFT JOIN hubstats_users ON hubstats_users.id = hubstats_deploys.user_id")
 
@@ -24,10 +23,10 @@ module Hubstats
     belongs_to :repo
     has_many :pull_requests
 
-    # Order the data in a given timespan in a given order
-    def self.order_with_timespan(timespan, order)
+    # Order the data in a given date range in a given order
+    def self.order_with_date_range(start_date, end_date, order)
       order = ["ASC", "DESC"].detect{|order_type| order_type.to_s == order.to_s.upcase } || "DESC"
-      deployed_since(timespan).order("hubstats_deploys.deployed_at #{order}")
+      deployed_in_date_range(start_date, end_date).order("hubstats_deploys.deployed_at #{order}")
     end
 
     # Sorts based on whether data is being grouped by user or repo

data/app/models/hubstats/label.rb

@@ -10,7 +10,7 @@ module Hubstats
        .order("pull_request_count DESC")
     end
 
-    scope :with_ids, lambda { |pull_ids| (where("hubstats_labels_pull_requests.pull_request_id" => pull_ids)) }
+    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,9 +1,9 @@
 module Hubstats
   class PullRequest < ActiveRecord::Base
-    scope :closed_since, lambda {|time| where("hubstats_pull_requests.closed_at > ?", time) }
-    scope :updated_since, lambda {|time| where("hubstats_pull_requests.updated_at > ?", time) }
-    scope :opened_since, lambda {|time| where("hubstats_pull_requests.created_at > ?", time) }
-    scope :merged_since, lambda {|time| where("hubstats_pull_requests.merged").where("hubstats_pull_requests.merged_at > ?", time) }
+    scope :closed_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.closed_at BETWEEN ? AND ?", start_date, end_date)}
+    scope :updated_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.updated_at BETWEEN ? AND ?", start_date, end_date)}
+    scope :created_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.created_at BETWEEN ? AND ?", start_date, end_date)}
+    scope :merged_in_date_range, lambda {|start_date, end_date| where("hubstats_pull_requests.merged").where("hubstats_pull_requests.merged_at BETWEEN ? AND ?", start_date, end_date)}
     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_deploy, lambda {|deploy_id| where(deploy_id: deploy_id)}
@@ -11,12 +11,12 @@ module Hubstats
     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 :with_label, lambda {|label_name| joins(:labels).where(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,
+     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,
@@ -56,26 +56,26 @@ module Hubstats
     end
 
     def add_labels(labels)
-      labels.map!{ |label| Hubstats::Label.first_or_create(label) }
+      labels.map!{|label| Hubstats::Label.first_or_create(label) }
       self.labels = labels
     end
 
-    def self.all_filtered(params, timespan)
-      filter_based_on_timespan(timespan, params[:state])
+    def self.all_filtered(params, start_date, end_date)
+      filter_based_on_date_range(start_date, end_date, 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)
+    def self.filter_based_on_date_range(start_date, end_date, state)
+      with_state(state).updated_in_date_range(start_date, end_date)
     end
 
-    def self.state_based_order(timespan,state,order)
+    def self.state_based_order(start_date, end_date, state, order)
       order = ["ASC","DESC"].detect{|order_type| order_type.to_s == order.to_s.upcase } || "DESC"
       if state == "closed"
-        with_state(state).updated_since(timespan).order("hubstats_pull_requests.closed_at #{order}")
+        with_state(state).updated_in_date_range(start_date, end_date).order("hubstats_pull_requests.closed_at #{order}")
       else #state == "open"
-        with_state(state).updated_since(timespan).order("hubstats_pull_requests.created_at #{order}")
+        with_state(state).updated_in_date_range(start_date, end_date).order("hubstats_pull_requests.created_at #{order}")
       end
     end
 

data/app/models/hubstats/repo.rb

@@ -1,32 +1,32 @@
 module Hubstats
   class Repo < ActiveRecord::Base
 
-    scope :with_recent_activity, lambda {|time| where("updated_at > ?", time).order("updated_at DESC")}
-    scope :with_id, lambda {|user_id| where(id: user_id.split(',')) if user_id}
+    scope :with_recent_activity, lambda {|start_date, end_date| where("hubstats_repos.updated_at BETWEEN ? AND ?", start_date, end_date).order("updated_at DESC")}
+    scope :with_id, lambda {|repo_id| where(id: repo_id.split(',')) if repo_id}
 
-    scope :deploys_or_comments_count, lambda {|time, data, began_time, name|
+    scope :deploys_count, lambda {|start_date, end_date|
       select("hubstats_repos.id as repo_id")
-       .select("IFNULL(COUNT(DISTINCT #{data}.id),0) AS #{name}_count")
-       .joins("LEFT JOIN #{data} ON #{data}.repo_id = hubstats_repos.id AND #{data}.#{began_time} > '#{time}'")
+       .select("IFNULL(COUNT(DISTINCT hubstats_deploys.id),0) AS deploy_count")
+       .joins(sanitize_sql_array(["LEFT JOIN hubstats_deploys ON hubstats_deploys.repo_id = hubstats_repos.id AND (hubstats_deploys.deployed_at BETWEEN ? AND ?)", start_date, end_date]))
        .group("hubstats_repos.id")
     }
 
-    scope :deploys_count, lambda {|time|
-      deploys_or_comments_count(time, "hubstats_deploys", "deployed_at", "deploy")
-    }
-
-    scope :comments_count, lambda {|time|
-      deploys_or_comments_count(time, "hubstats_comments", "created_at", "comment")
+    scope :comments_count, lambda {|start_date, end_date|
+      select("hubstats_repos.id as repo_id")
+       .select("IFNULL(COUNT(DISTINCT hubstats_comments.id),0) AS comment_count")
+       .joins(sanitize_sql_array(["LEFT JOIN hubstats_comments ON hubstats_comments.repo_id = hubstats_repos.id AND (hubstats_comments.created_at BETWEEN ? AND ?)", start_date, end_date]))
+       .group("hubstats_repos.id")
     }
  
-    scope :pull_requests_count, lambda {|time|
+    scope :pull_requests_count, lambda {|start_date, end_date|
       select("hubstats_repos.id as repo_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.repo_id = hubstats_repos.id AND hubstats_pull_requests.merged_at > '#{time}' AND hubstats_pull_requests.merged = '1'")
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.repo_id = hubstats_repos.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?)", start_date, end_date]))
+      .where("hubstats_pull_requests.merged = '1'")
       .group("hubstats_repos.id")
     }
 
-    scope :averages, lambda { |time|
+    scope :averages, lambda {|start_date, end_date|
       select("hubstats_repos.id as repo_id")
       .select("ROUND(IFNULL(AVG(hubstats_pull_requests.additions),0)) AS average_additions")
       .select("ROUND(IFNULL(AVG(hubstats_pull_requests.deletions),0)) AS average_deletions")
@@ -34,12 +34,12 @@ module Hubstats
       .group("hubstats_repos.id")
     }
 
-    scope :with_all_metrics, lambda { |time|
+    scope :with_all_metrics, lambda {|start_date, end_date|
       select("hubstats_repos.*, deploy_count, pull_request_count, comment_count, average_additions, average_deletions")
-      .joins("LEFT JOIN (#{averages(time).to_sql}) AS averages ON averages.repo_id = hubstats_repos.id")
-      .joins("LEFT JOIN (#{pull_requests_count(time).to_sql}) AS pull_requests ON pull_requests.repo_id = hubstats_repos.id")
-      .joins("LEFT JOIN (#{comments_count(time).to_sql}) AS comments ON comments.repo_id = hubstats_repos.id")
-      .joins("LEFT JOIN (#{deploys_count(time).to_sql}) AS deploys ON deploys.repo_id = hubstats_repos.id")
+      .joins("LEFT JOIN (#{averages(start_date, end_date).to_sql}) AS averages ON averages.repo_id = hubstats_repos.id")
+      .joins("LEFT JOIN (#{pull_requests_count(start_date, end_date).to_sql}) AS pull_requests ON pull_requests.repo_id = hubstats_repos.id")
+      .joins("LEFT JOIN (#{comments_count(start_date, end_date).to_sql}) AS comments ON comments.repo_id = hubstats_repos.id")
+      .joins("LEFT JOIN (#{deploys_count(start_date, end_date).to_sql}) AS deploys ON deploys.repo_id = hubstats_repos.id")
       .group("hubstats_repos.id")
     }
 
@@ -53,6 +53,7 @@ module Hubstats
 
     has_many :pull_requests
     has_many :deploys
+    has_many :comments
     belongs_to :owner, :class_name => "User", :foreign_key => "id"
 
     def self.create_or_update(github_repo)

data/app/models/hubstats/user.rb

@@ -3,78 +3,81 @@ module Hubstats
 
     scope :with_id, lambda {|user_id| where(id: user_id.split(',')) if user_id}
 
-    scope :deploys_or_comments_count, lambda {|time, data, began_time, name|
+    scope :deploys_count, lambda {|start_date, end_date|
       select("hubstats_users.id as user_id")
-       .select("IFNULL(COUNT(DISTINCT #{data}.id),0) AS #{name}_count")
-       .joins("LEFT JOIN #{data} ON #{data}.user_id = hubstats_users.id AND #{data}.#{began_time} > '#{time}'")
+       .select("IFNULL(COUNT(DISTINCT hubstats_deploys.id),0) AS deploy_count")
+       .joins(sanitize_sql_array(["LEFT JOIN hubstats_deploys ON hubstats_deploys.user_id = hubstats_users.id AND (hubstats_deploys.deployed_at BETWEEN ? AND ?)", start_date, end_date]))
        .group("hubstats_users.id")
     }
 
-    scope :deploys_count, lambda {|time|
-      deploys_or_comments_count(time, "hubstats_deploys", "deployed_at", "deploy")
-    }
-
-    scope :comments_count, lambda {|time|
-      deploys_or_comments_count(time, "hubstats_comments", "created_at", "comment")
+    scope :comments_count, lambda {|start_date, end_date|
+      select("hubstats_users.id as user_id")
+       .select("IFNULL(COUNT(DISTINCT hubstats_comments.id),0) AS comment_count")
+       .joins(sanitize_sql_array(["LEFT JOIN hubstats_comments ON hubstats_comments.user_id = hubstats_users.id AND (hubstats_comments.created_at BETWEEN ? AND ?)", start_date, end_date]))
+       .group("hubstats_users.id")
     }
  
-    scope :pull_requests_count, lambda {|time|
+    scope :pull_requests_count, lambda {|start_date, end_date|
       select("hubstats_users.id as user_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.merged_at > '#{time}' AND hubstats_pull_requests.merged = '1'")
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.merged_at BETWEEN ? AND ?)", start_date, end_date]))
+      .where("hubstats_pull_requests.merged = '1'")
       .group("hubstats_users.id")
     }
 
-    scope :pull_requests_count_by_repo, lambda {|time,repo_id|
+    scope :pull_requests_count_by_repo, lambda {|start_date, end_date, repo_id|
       select("hubstats_users.id as user_id")
       .select("IFNULL(COUNT(DISTINCT hubstats_pull_requests.id),0) AS pull_request_count")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.created_at > '#{time}' AND hubstats_pull_requests.repo_id = '#{repo_id}' AND hubstats_pull_requests.merged = '1'")
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.created_at BETWEEN ? AND ?)", start_date, end_date]))
+      .where("hubstats_pull_requests.repo_id = ? AND hubstats_pull_requests.merged = '1'", repo_id)
       .group("hubstats_users.id")
     }
 
-    scope :comments_count_by_repo, lambda {|time,repo_id|
+    scope :comments_count_by_repo, lambda {|start_date, end_date, repo_id|
       select("hubstats_users.id as user_id")
       .select("COUNT(DISTINCT hubstats_comments.id) AS comment_count")
-      .joins("LEFT JOIN hubstats_comments ON hubstats_comments.user_id = hubstats_users.id AND hubstats_comments.created_at > '#{time}' AND hubstats_comments.repo_id = '#{repo_id}'")
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_comments ON hubstats_comments.user_id = hubstats_users.id AND (hubstats_comments.created_at BETWEEN ? AND ?)", start_date, end_date]))
+      .where("hubstats_comments.repo_id = ?", repo_id)
       .group("hubstats_users.id")
     }
 
-    scope :pulls_reviewed_count, lambda { |time|
+    scope :pulls_reviewed_count, lambda {|start_date, end_date|
       select("hubstats_users.id as user_id")
       .select("COUNT(DISTINCT hubstats_pull_requests.id) as reviews_count")
-      .joins("LEFT JOIN hubstats_comments ON hubstats_comments.user_id = hubstats_users.id AND hubstats_comments.created_at > '#{time}'")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.id = hubstats_comments.pull_request_id AND hubstats_pull_requests.closed_at > '#{time}'")
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_comments ON hubstats_comments.user_id = hubstats_users.id AND (hubstats_comments.created_at BETWEEN ? AND ?)", start_date, end_date]))
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.id = hubstats_comments.pull_request_id AND (hubstats_pull_requests.closed_at BETWEEN ? AND ?)", start_date, end_date]))
       .where("hubstats_pull_requests.user_id != hubstats_users.id")
       .group("hubstats_users.id")
     }
     
-    scope :net_additions_count, lambda { |time|
+    scope :net_additions_count, lambda {|start_date, end_date|
       select("hubstats_users.id as user_id")
       .select("SUM(IFNULL(hubstats_pull_requests.additions, 0)) AS additions")
       .select("SUM(IFNULL(hubstats_pull_requests.deletions, 0)) AS deletions")
-      .joins("LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND hubstats_pull_requests.created_at > '#{time}' AND hubstats_pull_requests.merged = '1'")
+      .joins(sanitize_sql_array(["LEFT JOIN hubstats_pull_requests ON hubstats_pull_requests.user_id = hubstats_users.id AND (hubstats_pull_requests.created_at BETWEEN ? AND ?) AND hubstats_pull_requests.merged = '1'", start_date, end_date]))
       .group("hubstats_users.id")
     }
 
-    scope :pull_and_comment_count, lambda { |time|
+    scope :pull_and_comment_count, lambda {|start_date, end_date|
       select("hubstats_users.*, pull_request_count, comment_count")
-      .joins("LEFT JOIN (#{pull_requests_count(time).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
-      .joins("LEFT JOIN (#{comments_count(time).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{pull_requests_count(start_date, end_date).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{comments_count(start_date, end_date).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
 
-    scope :pull_and_comment_count_by_repo, lambda { |time,repo_id|
+    scope :pull_and_comment_count_by_repo, lambda {|start_date, end_date, repo_id|
       select("hubstats_users.*, pull_request_count, comment_count")
-      .joins("LEFT JOIN (#{pull_requests_count_by_repo(time,repo_id).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
-      .joins("LEFT JOIN (#{comments_count_by_repo(time,repo_id).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{pull_requests_count_by_repo(start_date, end_date, repo_id).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{comments_count_by_repo(start_date, end_date, repo_id).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
-    scope :with_all_metrics, lambda { |time|
+
+    scope :with_all_metrics, lambda {|start_date, end_date|
       select("hubstats_users.*, deploy_count, pull_request_count, comment_count, additions, deletions")
-      .joins("LEFT JOIN (#{net_additions_count(time).to_sql}) AS net_additions ON net_additions.user_id = hubstats_users.id")
-      .joins("LEFT JOIN (#{pull_requests_count(time).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
-      .joins("LEFT JOIN (#{comments_count(time).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
-      .joins("LEFT JOIN (#{deploys_count(time).to_sql}) AS deploys ON deploys.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{net_additions_count(start_date, end_date).to_sql}) AS net_additions ON net_additions.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{pull_requests_count(start_date, end_date).to_sql}) AS pull_requests ON pull_requests.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{comments_count(start_date, end_date).to_sql}) AS comments ON comments.user_id = hubstats_users.id")
+      .joins("LEFT JOIN (#{deploys_count(start_date, end_date).to_sql}) AS deploys ON deploys.user_id = hubstats_users.id")
       .group("hubstats_users.id")
     }
 
@@ -103,11 +106,11 @@ module Hubstats
       Rails.logger.warn user.errors.inspect
     end
 
-    def self.with_pulls_or_comments(time, repo_id = nil)
+    def self.with_pulls_or_comments(start_date, end_date, repo_id = nil)
       if repo_id
-        pull_and_comment_count_by_repo(time,repo_id).weighted_sort
+        pull_and_comment_count_by_repo(start_date, end_date, repo_id).weighted_sort
       else
-        pull_and_comment_count(time).weighted_sort
+        pull_and_comment_count(start_date, end_date).weighted_sort
       end
     end
 

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

@@ -24,12 +24,14 @@
               <%= link_to "Users", users_path%></li>
           <li>
             <select class="form-control push-down" id="time-select">
-              <% Hubstats::TIMESPAN_ARRAY.each do |timespan| %>
-                <option value=<%= timespan[:date] %>><%=timespan[:display_value]%></option>
+              <% Hubstats::DATE_RANGE_ARRAY.each do |date| %>
+                <option value=<%= date[:date] %>><%=date[:display_value]%></option>
               <% end %>
             </select>
           </li>
         </ul>
+        <!-- Start time: <%=@start_date%>
+        End time: <%=@end_date%> -->
       </div>
     </div>
   </nav>

data/app/views/layouts/hubstats/application.html.erb

@@ -7,6 +7,7 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
+	
 <%= render 'hubstats/partials/header' %>
 <%= yield %>
 

data/hubstats.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", "~> 3.2.18"
   s.add_dependency "octokit", "~> 3.2"
   s.add_dependency "will_paginate-bootstrap"
+  s.add_dependency "bootstrap-datepicker"
   s.add_dependency "select2-rails", "3.5.9"
 
   s.add_development_dependency "rspec-rails",'~> 3.0.0.beta'

data/lib/hubstats.rb

@@ -8,7 +8,7 @@ require "hubstats/config"
 
 module Hubstats
 
-  TIMESPAN_ARRAY = [
+  DATE_RANGE_ARRAY = [
     {
       display_value: "Today",
       date: 1.day

data/lib/hubstats/version.rb

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

data/spec/controllers/hubstats/deploys_controller_spec.rb

@@ -24,7 +24,7 @@ module Hubstats
                                   :deployed_at => "2011-02-03 03:00:00 -0500",
                                   :user_id => nil)
         deploys_ordered = [deploy2, deploy3, deploy1]
-        expect(Hubstats::Deploy).to receive_message_chain("group_by.order_with_timespan.paginate").and_return(deploys_ordered)
+        expect(Hubstats::Deploy).to receive_message_chain("group_by.order_with_date_range.paginate").and_return(deploys_ordered)
         get :index
         expect(response).to have_http_status(200)
         expect(response).to render_template(:index)

data/spec/controllers/hubstats/pull_requests_controller_spec.rb

@@ -31,13 +31,14 @@ module Hubstats
         pull = create(:pull_request, :user => user,
                                      :repo => repo,
                                      :deploy_id => 404040)
-        comment1 = create(:comment, :pull_request_id => pull.id)
-        comment2 = create(:comment, :pull_request_id => pull.id)
-        comment3 = create(:comment, :pull_request_id => pull.id)
+        comment1 = create(:comment, :pull_request_id => pull.id, :created_at => "2015-06-16")
+        comment2 = create(:comment, :pull_request_id => pull.id, :created_at => "2015-06-16")
+        comment3 = create(:comment, :pull_request_id => pull.id, :created_at => "2015-06-16")
         get :show, repo: repo, id: pull.id
         expect(assigns(:pull_request)).to eq(pull)
         expect(assigns(:pull_request).repo_id).to eq(101010)
         expect(assigns(:pull_request).deploy_id).to eq(404040)
+        # Below test could potentially fail if the date range changes
         expect(assigns(:comments)).to contain_exactly(comment1, comment2, comment3)
         expect(assigns(:pull_request).user_id).to eq(user.id)
       end

data/spec/controllers/hubstats/repos_controller_spec.rb

@@ -8,17 +8,22 @@ module Hubstats
       it "should list all of the repos" do        
         repo1 = create(:repo, :id => 101010,
                               :name => "silly",
-                              :full_name => "sportngin/silly")
+                              :full_name => "sportngin/silly",
+                              :updated_at => "2015-06-16")
         repo2 = create(:repo, :id => 202020,
                               :name => "funny",
-                              :full_name => "sportngin/funny")
+                              :full_name => "sportngin/funny",
+                              :updated_at => "2015-06-16")
         repo3 = create(:repo, :id => 303030,
                               :name => "loosey",
-                              :full_name => "sportngin/loosey")
+                              :full_name => "sportngin/loosey",
+                              :updated_at => "2015-06-16")
         repo4 = create(:repo, :id => 404040,
                               :name => "goosey",
-                              :full_name => "sportngin/goosey")
+                              :full_name => "sportngin/goosey",
+                              :updated_at => "2015-06-16")
         get :index
+        # Below test could potentially fail if the date range changes
         expect(assigns(:repos)).to contain_exactly(repo2, repo1, repo3, repo4)
       end
     end

data/spec/models/hubstats/deploy_spec.rb

@@ -16,7 +16,7 @@ module Hubstats
       expect(deploy.user_id).to eq(202020)
     end
 
-    it 'should order deploys based on timespan ASC' do
+    it 'should order deploys based on date range ASC' do
       repo = build(:repo)
       deploy1 = Deploy.create(git_revision: "c1a2b37",
                               repo_id: repo.id, 
@@ -28,19 +28,19 @@ module Hubstats
                               user_id: 202020)
       deploy3 = Deploy.create(git_revision: "k10d8as",
                               repo_id: repo.id, 
-                              deployed_at: "2015-08-21 12:00:00", 
+                              deployed_at: "2015-03-21 12:00:00", 
                               user_id: 202020)
       deploy4 = Deploy.create(git_revision: "917d9ss",
                               repo_id: repo.id, 
                               deployed_at: "2014-12-19 08:00:00", 
                               user_id: 202020)
       deploys_ordered = [deploy1, deploy2, deploy4, deploy3]
-      new_ordered_deploys = Deploy.order_with_timespan(520.weeks, "ASC")
+      new_ordered_deploys = Deploy.order_with_date_range("2005-07-01", "2015-06-19", "ASC")
       expect(Deploy.count).to eq(4)
       expect(new_ordered_deploys).to eq(deploys_ordered)
     end
 
-    it 'should order deploys based on timespan DESC' do
+    it 'should order deploys based on date range DESC' do
       repo = build(:repo)
       deploy1 = Deploy.create(git_revision: "c1a2b37",
                               repo_id: repo.id, 
@@ -52,14 +52,14 @@ module Hubstats
                               user_id: 202020)
       deploy3 = Deploy.create(git_revision: "k10d8as",
                               repo_id: repo.id, 
-                              deployed_at: "2015-08-21 12:00:00", 
+                              deployed_at: "2015-03-21 12:00:00", 
                               user_id: 202020)
       deploy4 = Deploy.create(git_revision: "917d9ss",
                               repo_id: repo.id, 
                               deployed_at: "2014-12-19 08:00:00", 
                               user_id: 202020)
       deploys_ordered = [deploy3, deploy4, deploy2, deploy1]
-      new_ordered_deploys = Deploy.order_with_timespan(520.weeks, "DESC")
+      new_ordered_deploys = Deploy.order_with_date_range("2005-07-01", "2015-06-19", "DESC")
       expect(Deploy.count).to eq(4)
       expect(new_ordered_deploys).to eq(deploys_ordered)
     end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'faker'
 # run twice. It is recommended that you do not name files matching this glob to
 # end with _spec.rb. You can configure this pattern with with the --pattern
 # option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f }
 
 RSpec.configure do |config|
   # ## Mock Framework

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require "rails/test_help"
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,6 +53,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-datepicker
+  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
@@ -215,6 +229,7 @@ files:
 - app/views/hubstats/users/show.html.erb
 - app/views/layouts/hubstats/application.html.erb
 - config/routes.rb
+- date_range
 - db/migrate/20140604130339_create_hubstats_pull_requests.rb
 - db/migrate/20140604130457_create_hubstats_users.rb
 - db/migrate/20140604130504_create_hubstats_comments.rb