hubstats 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69e9dceef5709af0e101322ae573c8d1a4a035ed
-  data.tar.gz: 961b6cca0f491a47d3d8a475e7e7b8227c45c374
+  metadata.gz: c81117f077e962453994f09ec5e806c32fb4b0c3
+  data.tar.gz: 9400a593fd42d99fcc32a05a437a53ee5a620937
 SHA512:
-  metadata.gz: f729109c909f949efb5f68794f3603877269da76ab8762990c433af36a0d276dd6031f1328685292df1c006bfd5cf4d513d96f147648dd8d2043a2643c25b510
-  data.tar.gz: d54b403aea3fb86a3de0b4621637f5f938364ae461792d1e23b0439111eb3d12409318ee3a31f0573f7688e6e7ac5b97288c1399b0aa745d1dadacec631c4bd3
+  metadata.gz: 1dd16f156ddf9c069529ab49b371abc7c3a328169b72e3d8390f34b01a02b10138ad02a154de9c67e6158f17cd85405bfdd0a9e59ba81c8440f5c14f4ed57145
+  data.tar.gz: 9db16e4c561c99cdcb7186750aa2012f0cc29890d9fa161486d55f36683b0656390160aaaedfbfecdcda8385cde74bf820a2bd8bb03cbcc8095dfe6ecf0a66be

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v0.8.0
+* Do not show ignored users on lists, in stats, etc
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/hubstats/pull/111
+
 #### v0.7.7
 * Fixing error where updating teams does not grab all of organization's teams
 

data/app/controllers/hubstats/users_controller.rb

@@ -14,6 +14,7 @@ module Hubstats
         @users = Hubstats::User.where(id: params[:id].split(",")).order("login ASC")
       else
         @users = Hubstats::User.with_all_metrics(@start_date, @end_date)
+          .where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"])
           .with_id(params[:users])
           .custom_order(params[:order])
           .paginate(:page => params[:page], :per_page => 15)

data/app/helpers/hubstats/metrics_helper.rb

@@ -26,14 +26,14 @@ module Hubstats
     #
     # Returns - the number of pull requests
     def get_pull_count
-      Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).count(:all)
+      Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).ignore_pulls_by(Hubstats::User.ignore_users_ids).count(:all)
     end
 
     # Public - Gets the number of comments within the start date and end date
     #
     # Returns - the number of comments
     def get_comment_count
-      Hubstats::Comment.created_in_date_range(@start_date, @end_date).count(:all)
+      Hubstats::Comment.created_in_date_range(@start_date, @end_date).ignore_comments_by(Hubstats::User.ignore_users_ids).count(:all)
     end
 
     # Public - Gets the number of comments per reviewer within the start date and end date

data/app/models/hubstats/comment.rb

@@ -5,6 +5,7 @@ module Hubstats
 
     # Various checks that can be used to filter and find info about comments.
     scope :created_in_date_range, lambda {|start_date, end_date| where("hubstats_comments.created_at BETWEEN ? AND ?", start_date, end_date)}
+    scope :ignore_comments_by, lambda {|user_ids| where("user_id NOT IN (?)", user_ids) if user_ids}
     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_team, lambda {|user_ids| where(user_id: user_ids) if user_ids}

data/app/models/hubstats/pull_request.rb

@@ -9,6 +9,7 @@ module Hubstats
     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 :created_since, lambda {|days| where("hubstats_pull_requests.created_at > ?", Date.today - days)}
+    scope :ignore_pulls_by, lambda {|user_ids| where("user_id NOT IN (?)", user_ids) if user_ids}
     scope :belonging_to_repo, lambda {|repo_id| where(repo_id: repo_id)}
     scope :belonging_to_team, lambda {|team_id| where(team_id: team_id)}
     scope :belonging_to_user, lambda {|user_id| where(user_id: user_id)}

data/app/models/hubstats/user.rb

@@ -3,10 +3,11 @@ module Hubstats
 
     # Various checks that can be used to filter and find info about users.
     scope :with_id, lambda {|user_id| where(id: user_id.split(',')) if user_id}
-    scope :only_active, -> { having("comment_count > 0 OR pull_request_count > 0 OR deploy_count > 0") }
-    scope :is_developer, -> { having("pull_request_count > 0") }
-    scope :is_reviewer, -> { having("comment_count > 0") }
+    scope :only_active, -> { where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).having("comment_count > 0 OR pull_request_count > 0 OR deploy_count > 0") }
+    scope :is_developer, -> { where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).having("pull_request_count > 0") }
+    scope :is_reviewer, -> { where("login NOT IN (?)", Hubstats.config.github_config["ignore_users_list"]).having("comment_count > 0") }
     scope :with_contributions, lambda {|start_date, end_date, repo_id| with_all_metrics_repos(start_date, end_date, repo_id) if repo_id}
+    scope :ignore_users_ids, -> { where("login IN (?)", Hubstats.config.github_config["ignore_users_list"]).pluck(:id) }
 
     # Public - Counts all of the deploys for selected user that occurred between the start_date and end_date.
     # 

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "0.7.7"
+  VERSION = "0.8.0"
 end

data/spec/controllers/hubstats/repos_controller_spec.rb

@@ -22,6 +22,7 @@ module Hubstats
                               :name => "goosey",
                               :full_name => "sportngin/goosey",
                               :updated_at => Date.today)
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
         get :index
         expect(assigns(:repos)).to contain_exactly(repo2, repo1, repo3, repo4)
       end
@@ -43,6 +44,7 @@ module Hubstats
                                       :user => user)
         deploy1 = create(:deploy, :repo_id => 101010)
         deploy2 = create(:deploy, :repo_id => 101010)
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
         get :show, repo: repo.name
         expect(assigns(:repo)).to eq(repo)
         expect(assigns(:repo).pull_requests).to contain_exactly(pull1, pull2)
@@ -71,6 +73,7 @@ module Hubstats
                               :full_name => "sportngin/goosey",
                               :updated_at => Date.today)
         expect(Hubstats::Repo).to receive_message_chain("with_id.custom_order.paginate").and_return([repo1, repo2, repo3, repo4])
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
         get :index
         expect(response).to have_http_status(200)
       end

data/spec/controllers/hubstats/users_controller_spec.rb

@@ -11,6 +11,7 @@ module Hubstats
         user3 = create(:user, :id => 303030, :login => "examplePerson3", :updated_at => Date.today)
         user4 = create(:user, :id => 404040, :login => "examplePerson4", :updated_at => Date.today)
         expect(Hubstats::User).to receive_message_chain("with_id.custom_order.paginate").and_return([user2, user3, user1, user4])
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
         get :index
         expect(response).to have_http_status(200)
       end
@@ -26,6 +27,7 @@ module Hubstats
         deploy2 = create(:deploy, :user_id => 101010)
         comment1 = create(:comment, :user => user, :updated_at => Date.today)
         comment2 = create(:comment, :user => user, :updated_at => Date.today)
+        allow(Hubstats).to receive_message_chain(:config, :github_config, :[]).with("ignore_users_list") { ["user"] }
         get :show, id: "examplePerson"
         expect(assigns(:user)).to eq(user)
         expect(assigns(:user).pull_requests).to contain_exactly(pull1, pull2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails