hubstats 1.0.0.beta2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802a99fc98c0f264072c31356e0ecfb571c2e01ef1563cba5325ce8111c95db8
-  data.tar.gz: 0de3cc728105f34ff7ba2df58ebae2094f4a28566317ede5aeca35b84ffa82e5
+  metadata.gz: 9e5143e6456771677de3cc90bbe833374cf25fbf5ebb682e39e97ce7118c397e
+  data.tar.gz: a8af23b964e8455c73e9ab2459c8f60741fcc593e9982e399bf386d955febf68
 SHA512:
-  metadata.gz: f52fd3881a286065fe4482934e6e61f397d9c5af62175b664c36992e6a9ea31d4047369b2466f328635487dcf01c36c6f878999bf22dc743f28569b2af9a327f
-  data.tar.gz: 4b3dbe91fc2e48a6d94fa3cb8f2289ed028414bd9e6f4b44d6c13dc236b4e8c2004ee1743754a0e7ffaec3eb3eaf65988b8de44484961974e153111639e3dcc7
+  metadata.gz: 1d5fb94663467fd706e1d6c74afa91c61efb097607ad47e8bfe07d6789997dd1a5aa263fe49a3df6ac4c16eca9fa9eb738e3b812f4582f37a9407df0590fc41d
+  data.tar.gz: 89c01859c31a42c1caa47f820475cf83af7335d609ae9734eec9240a07cbc7cc8d027d120485db36320041816dc0186cae945ae03957db6936a2cc642fdcd07b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+2.6.1

data/.travis.yml

@@ -1,19 +1,24 @@
-sudo: false
+os: linux
 dist: trusty
 language: ruby
 cache: bundler
+install:
+  - gem install bundler -v 1.17.3
+  - bundle _1.17.3_ install --jobs=3 --retry=3
 
 branches:
   only:
     - master
+
 rvm:
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.3.3
+  - 2.6.1
 
 script: bundle exec rspec
 before_script:
   - bundle exec rake app:db:create
   - bundle exec rake app:db:migrate
   - bundle exec rake app:db:test:prepare
-

data/CHANGELOG.markdown

@@ -1,19 +1,6 @@
-#### v0.12.2
-* Fix bug that results in comments never being saved
+#### v1.2.1
+* IS-12226 Update octokit
 
-  > Emma Sax: production-status-check[bot]: https://github.com/sportngin/hubstats/pull/134
+  > Emma Sax: production-status-check[bot]: https://github.com/sportngin/hubstats/pull/143
 
-#### v0.12.1
-* Show 50 items in detailed show pages
-
-  > Emma Sax: Unknown User: https://github.com/sportngin/hubstats/pull/133
-
-#### v0.12.0
-#### v0.11.5
-* Fix bug where adding repositories will break if there are no commits
-
-  > Emma Sax: AJ Stuyvenberg, Unknown User: https://github.com/sportngin/hubstats/pull/131
-
-#### v0.11.4
-#### v0.11.3
-#### v0.11.2
+#### v1.2.0

data/MIT-LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2015 Sport Ngin
+Copyright 2019 Sport Ngin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/hubstats/events_controller.rb

@@ -10,24 +10,11 @@ module Hubstats
     #
     # Returns - nothing, but makes a new event
     def handler
-      # verify_signature(request)
-
-      Rails.logger.warn("Webhook received from Github.")
-      puts "Webhook received from Github."
-
+      verify_signature(request)
       kind = request.headers['X-Github-Event']
-      Rails.logger.warn("Kind of webhook: #{kind}")
-      puts "Kind of webhook: #{kind}"
-
       event = event_params.with_indifferent_access
-      Rails.logger.warn("Event: #{event}")
-      puts "Event: #{event}"
-
       raw_parameters = request.request_parameters
       event[:github_action] = raw_parameters["action"]
-      Rails.logger.warn("Github action: #{event[:github_action]}")
-      puts "Github action: #{event[:github_action]}"
-
       eventsHandler = Hubstats::EventsHandler.new()
       eventsHandler.route(event, kind)
 
@@ -39,12 +26,12 @@ module Hubstats
     # request - the signature to be checked
     #
     # Returns - an error if the signatures don't match
-    # private def verify_signature(request)
-    #   request.body.rewind
-    #   payload_body = request.body.read
-    #   signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), Hubstats.config.webhook_endpoint, payload_body)
-    #   return 500, "Signatures didn't match!" unless Rack::Utils.secure_compare(signature, request.env['HTTP_X_HUB_SIGNATURE'])
-    # end
+    private def verify_signature(request)
+      request.body.rewind
+      payload_body = request.body.read
+      signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), Hubstats.config.webhook_endpoint, payload_body)
+      return 500, "Signatures didn't match!" unless Rack::Utils.secure_compare(signature, request.env['HTTP_X_HUB_SIGNATURE'])
+    end
 
     # Private - Allows only these parameters to be added when creating an event
     #

data/app/controllers/hubstats/teams_controller.rb

@@ -9,7 +9,7 @@ module Hubstats
     # Returns - the team data
     def index
       if params[:query] ## For select 2
-        @teams = Hubstats::Team.where("name LIKE ?", "%#{params[:query]}%").order("name ASC")
+        @teams = Hubstats::Team.where(hubstats: true).where("name LIKE ?", "%#{params[:query]}%").order("name ASC")
       elsif params[:id]
         @teams = Hubstats::Team.where(id: params[:id].split(",")).order("name ASC")
       else
@@ -42,7 +42,7 @@ module Hubstats
       @net_additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).sum(:additions).to_i -
                        Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).sum(:deletions).to_i
       @additions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).average(:additions)
-      @deletions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).average(:deletions)      
+      @deletions = Hubstats::PullRequest.merged_in_date_range(@start_date, @end_date).belonging_to_team(@team.id).average(:deletions)
 
       stats
     end

data/app/models/hubstats/team.rb

@@ -47,6 +47,14 @@ module Hubstats
 
     has_and_belongs_to_many :users, :join_table => 'hubstats_teams_users', :uniq => true
 
+    # Public - Will change the team's hubstats column to false
+    #
+    # Returns - the team
+    def deprecate_team
+      self.update_column(:hubstats, false)
+      self.save!
+    end
+
     # Public - Checks if the team is currently existing, and if it isn't, then makes a new team with
     # the specifications that are passed in. We are assuming that if it is not already existent,
     # then we probably don't really care about the team, so our hubstats boolean will be set to false.

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

@@ -4,7 +4,7 @@
     <div class="col-lg-3 col-md-3 col-sm-3">
       <!-- Show the Sport Ngin copyright information, change if using a different copyright -->
       <div class="footer-text">
-        © 2015 Sport Ngin
+        © 2019 Sport Ngin
       </div>
     </div>
     <div class="col-lg-6 col-md-6 col-sm-6">

data/hubstats.gemspec

@@ -17,11 +17,15 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
 
   s.add_dependency "rails", "~> 4.2.10"
-  s.add_dependency "rake", "= 12.3.2"
-  s.add_dependency "octokit", "~> 4.2"
+  s.add_dependency "rake", ">= 12.3.3"
+  s.add_dependency "octokit", "~> 4.18"
   s.add_dependency "will_paginate-bootstrap", "~> 1.0"
   s.add_dependency "select2-rails", "~> 3.0"
   s.add_dependency "sass-rails"
+  s.add_dependency "railties", "~> 4.2.11.1"
+  s.add_dependency "jquery-rails", "= 4.3.3"
+  s.add_dependency "sprockets", "~> 3.7.2"
+  s.add_dependency "sprockets-rails", "~> 2.3.3"
   s.add_dependency "bootstrap-datepicker-rails", "~> 1.5"
 
   s.add_development_dependency "mysql2",'~> 0.3.2'

data/lib/hubstats/events_handler.rb

@@ -1,6 +1,5 @@
 module Hubstats
   class EventsHandler
-
     # Public - Processes comments and PRs
     #
     # payload - the data that we will be processing
@@ -10,51 +9,46 @@ module Hubstats
     def route(payload, type)
       case type
       when "issue_comment", "IssueCommentEvent"
-        comment_processor(payload, "Issue")
+        comment_processor(payload, "Issue") # comment on a pull request
       when "commit_comment", "CommitCommentEvent"
-        comment_processor(payload, "Commit")
-      when "pull_request", "PullRequestEvent"
-        pull_processor(payload)
+        comment_processor(payload, "Commit") # comment on a pull request commit
       when "pull_request_review_comment", "PullRequestReviewCommentEvent"
-        comment_processor(payload, "PullRequest")
+        comment_processor(payload, "PullRequest") # comment on a pull request review
+      when "pull_request", "PullRequestEvent"
+        pull_processor(payload) # new pull request
       when "membership", "MembershipEvent", "team", "TeamEvent"
-        team_processor(payload)
+        team_processor(payload) # adding/editing/deleting/modifying teams
       when "repository", "RepositoryEvent"
-        repository_processor(payload)
+        repository_processor(payload) # adding repositories
       end
     end
 
-    # Public - Gets the information for the PR, creates/updates the new PR, grabs the labels, and makes new labels;
+    # Private - Gets the information for the PR, creates/updates the new PR, grabs the labels, and makes new labels;
     #  if the label qa-approved is added or removed, a new QA Signoff record will be made
     #
     # payload - the information that we will use to get data off of
     #
     # Returns - nothing, but creates/updates the PR and adds appropriate labels
-    def pull_processor(payload)
+    private def pull_processor(payload)
       pull_request = payload[:pull_request]
       pull_request[:repository] = payload[:repository]
       new_pull = Hubstats::PullRequest.create_or_update(pull_request.with_indifferent_access)
+
       if payload[:github_action].include?('labeled')
-        if payload[:github_action].include?('unlabeled') && payload[:label][:name].include?('qa-approved')
-          Hubstats::QaSignoff.remove_signoff(payload[:repository][:id], payload[:pull_request][:id])
-        elsif payload[:label][:name].include?('qa-approved')
-          Hubstats::QaSignoff.first_or_create(payload[:repository][:id], payload[:pull_request][:id], payload[:sender][:id])
-        end
-        new_pull.update_label(payload)
+        organize_qa_signoffs(payload, new_pull)
       else
-        repo_name = Hubstats::Repo.where(id: new_pull.repo_id).first.full_name
-        labels = Hubstats::GithubAPI.get_labels_for_pull(repo_name, new_pull.number)
-        new_pull.add_labels(labels)
+        add_labels_to_pull(new_pull)
       end
+
       new_pull.save!
     end
 
-    # Public - Gets the information for the new comment and updates it
+    # Private - Gets the information for the new comment and updates it
     #
     # payload - the information that we will use to get data off of
     #
     # Returns - nothing, but updates the comment
-    def comment_processor(payload, kind)
+    private def comment_processor(payload, kind)
       comment = payload[:comment]
       comment[:kind] = kind
       comment[:repo_id] = payload[:repository][:id]
@@ -62,48 +56,45 @@ module Hubstats
       Hubstats::Comment.create_or_update(comment.with_indifferent_access)
     end
 
-    # Public - Gets the information for the new team and updates it
+    # Private - Gets the information for the team in the payload and updates it appropriately
     #
     # payload - the information that we will use to get the data off of
     #
     # Returns - nothing, but updates or makes the team
-    def team_processor(payload)
-      team = payload[:team]
-
-      if payload[:scope] == "team" && payload[:github_action] == "added"
-        if Hubstats::Team.designed_for_hubstats?(team[:description])
-           Hubstats::Team.create_or_update(team.with_indifferent_access)
-           hubstats_team = Hubstats::Team.where(name: team[:name]).first
-           hubstats_user = Hubstats::User.create_or_update(payload[:member])
-           Hubstats::Team.update_users_in_team(hubstats_team, hubstats_user, payload[:github_action])
-        end
+    private def team_processor(payload)
+      # Adding a new hubstats team, adding/removing a person to/from a team, or renaming a team
+      if (payload[:scope] == "team" || payload[:github_action] == "edited") &&
+          Hubstats::Team.designed_for_hubstats?(payload[:team][:description])
+        Hubstats::Team.create_or_update(payload[:team].with_indifferent_access)
+        hubstats_team = Hubstats::Team.where(name: payload[:team][:name]).first
+        hubstats_user = payload[:member] ? Hubstats::User.create_or_update(payload[:member]) : Hubstats::User.create_or_update(payload[:sender])
+        Hubstats::Team.update_users_in_team(hubstats_team, hubstats_user, payload[:github_action])
       end
 
-      if payload[:github_action] == "edited" && Hubstats::Team.designed_for_hubstats?(team[:description])
-        Hubstats::Team.create_or_update(team.with_indifferent_access)
-        hubstats_team = Hubstats::Team.where(name: team[:name]).first
-        hubstats_user = Hubstats::User.create_or_update(payload[:member])
-        Hubstats::Team.update_users_in_team(hubstats_team, hubstats_user, payload[:github_action])
+      # Deleting a hubstats team
+      if payload[:scope] == "organization" && payload[:github_action] == "removed"
+        deprecate_team(payload)
       end
     end
 
-    def repository_processor(payload)
-      repo = payload[:repository]
-
+    # Private - Gets the information for the repository in the payload and creates/updates it
+    #
+    # payload - the information that we will use to get the data off of
+    #
+    # Returns - nothing, but updates or makes the repository
+    private def repository_processor(payload)
       if payload[:github_action] == "created" # it's a new repository
-        Hubstats::Repo.create_or_update
-        Hubstats::GithubAPI.create_repo_hook(repo)
-        # The hook was probably already made when we made the repository,
-        # but we'll put this here just in case
+        Hubstats::Repo.create_or_update(payload[:repository].with_indifferent_access)
+        Hubstats::GithubAPI.create_repo_hook(payload[:repository].with_indifferent_access)
       end
     end
 
-    # Public - Grabs the PR number off of any of the various places it can be
+    # Private - Grabs the PR number off of any of the various places it can be
     #
     # payload - the thing that we will use to try to attain the PR number
     #
     # Returns - the PR number
-    def get_pull_number(payload)
+    private def get_pull_number(payload)
       if payload[:pull_request]
         return payload[:pull_request][:number]
       elsif payload[:issue]
@@ -114,5 +105,41 @@ module Hubstats
         return nil
       end
     end
+
+    # Private - Will add QA signoffs to a pull request if they're present
+    #
+    # payload - data that we can add signoffs to
+    # new_pull - the pull request we just made or updated
+    #
+    # Returns - nothing
+    private def organize_qa_signoffs(payload, new_pull)
+      if payload[:github_action].include?('unlabeled') && payload[:label][:name].include?('qa-approved')
+        Hubstats::QaSignoff.remove_signoff(payload[:repository][:id], payload[:pull_request][:id])
+      elsif payload[:label][:name].include?('qa-approved')
+        Hubstats::QaSignoff.first_or_create(payload[:repository][:id], payload[:pull_request][:id], payload[:sender][:id])
+      end
+      new_pull.update_label(payload)
+    end
+
+    # Private - Will add labels to pull requests
+    #
+    # new_pull - the pull request we just made or updated
+    #
+    # Returns - nothing
+    private def add_labels_to_pull(new_pull)
+      repo_name = Hubstats::Repo.where(id: new_pull.repo_id).first.full_name
+      labels = Hubstats::GithubAPI.get_labels_for_pull(repo_name, new_pull.number)
+      new_pull.add_labels(labels)
+    end
+
+    # Private - Will deprecate the team if it is in the DB and needs to be deprecated
+    #
+    # payload - data that we can add signoffs to
+    #
+    # Returns - nothing
+    private def deprecate_team(payload)
+      hubstats_team = Hubstats::Team.where(name: payload[:team][:name]).first
+      hubstats_team.deprecate_team if (hubstats_team && hubstats_team[:hubstats])
+    end
   end
 end

data/lib/hubstats/github_api.rb

@@ -122,34 +122,17 @@ module Hubstats
       end
     end
 
-    # Public - Goes through entire team database and updates the hubstats boolean based on the octokit.yml file
-    #
-    # Returns - nothing
-    def self.deprecate_teams
-      teams = Hubstats::Team.all
-
-      teams.each do |team|
-        desc = client.team(team.id)[:description]
-        if Hubstats::Team.designed_for_hubstats?(desc) && (team[:hubstats] == true)
-          team.update_column(:hubstats, false)
-          team.save!
-          puts "Changed #{team[:name]} from true to false"
-        end
-      end
-
-      puts "All teams are up to date"
-      puts "Run 'rake hubstats:update_teams' or 'rake hubstats:update_teams_in_pulls' to grab more teams from GitHub"
-    end
-
     # Public - Makes a new webhook from a repository
     #
     # repo - the repository that is attempting to have a hook made with
     #
     # Returns - the hook and a message (or just a message and no hook)
     def self.create_repo_hook(repo)
+      repo_name = repo[:full_name] ? repo[:full_name] : repo.full_name
+      puts "Repo that we're going to make a hook on: #{repo_name}"
       begin
         client.create_hook(
-          repo.full_name,
+          repo_name,
           'web',
           {
             :url => Hubstats.config.webhook_endpoint,
@@ -161,11 +144,11 @@ module Hubstats
             :active => true
           }
         )
-        puts "Hook on #{repo.full_name} successfully created"
+        puts "Hook on #{repo_name} successfully created"
       rescue Octokit::UnprocessableEntity
-        puts "Hook on #{repo.full_name} already existed"
+        puts "Hook on #{repo_name} already existed"
       rescue Octokit::NotFound
-        puts "You don't have sufficient privileges to add an event hook to #{repo.full_name}"
+        puts "You don't have sufficient privileges to add an event hook to #{repo_name}"
       end
     end
 

data/lib/hubstats/version.rb

@@ -1,3 +1,3 @@
 module Hubstats
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.2.1"
 end

data/lib/tasks/hubstats_tasks.rake

@@ -18,18 +18,18 @@ namespace :hubstats do
     Rake::Task['hubstats:setup'].invoke
   end
 
-  desc "Updates changes to the config file"
-  task :update => :environment do
-    puts "Updating repos and teams"
-    Rake::Task['hubstats:populate:update'].invoke
-  end
-
   desc "Updates the seed"
   task :seed => :environment do
     puts "Updating seed"
     Rake::Task['db:seed'].invoke
   end
 
+  desc "Updates changes to the config file"
+  task :update => :environment do
+    puts "Updating repos and teams"
+    Rake::Task['hubstats:populate:update'].invoke
+  end
+
   desc "Updates the teams for past pull requests"
   task :update_teams_in_pulls => :environment do
     puts "Updating teams for past pull requests"
@@ -42,12 +42,6 @@ namespace :hubstats do
     Rake::Task['hubstats:populate:update_teams'].invoke
   end
 
-  desc "Deprecates teams"
-  task :deprecate_teams => :environment do
-    puts "Deprecating teams"
-    Rake::Task['hubstats:populate:deprecate_teams'].invoke
-  end
-
   desc "Creates webhook from github for organization"
   task :make_org_webhook => :environment do
     puts "Making a webhook for an organization in octokit.yml"

data/lib/tasks/populate_task.rake

@@ -33,7 +33,7 @@ namespace :hubstats do
 
     desc "Updates teams for past pull requests"
     task :update_teams_in_pulls => :environment do
-      update_teams_in_prs
+      Hubstats::PullRequest.update_teams_in_pulls(365)
     end
 
     desc "Updates the teams"
@@ -41,21 +41,8 @@ namespace :hubstats do
       update_teams
     end
 
-    desc "Deprecates teams"
-    task :deprecate_teams => :environment do
-      Hubstats::GithubAPI.deprecate_teams
-    end
-
     desc "Creates the webhook for the current org"
     task :create_organization_hook => :environment do
-      create_org_hook
-    end
-
-    task :create_org_hook => :environment do
-      create_org_hook
-    end
-
-    private def create_org_hook
       Hubstats::GithubAPI.create_org_hook(Hubstats.config.github_config["org_name"])
     end
 
@@ -70,6 +57,14 @@ namespace :hubstats do
       # populate_labels(repo)
     end
 
+    private def update_pulls
+      Hubstats::GithubAPI.update_pulls
+    end
+
+    private def update_teams
+      Hubstats::GithubAPI.update_teams
+    end
+
     private def populate_users(repo)
       repo = repo_checker(repo)
       puts "Adding contributors to " + repo.full_name
@@ -102,18 +97,6 @@ namespace :hubstats do
       Hubstats::GithubAPI.add_labels(repo)
     end
 
-    private def update_pulls
-      Hubstats::GithubAPI.update_pulls
-    end
-
-    private def update_teams
-      Hubstats::GithubAPI.update_teams
-    end
-
-    private def update_teams_in_prs
-      Hubstats::PullRequest.update_teams_in_pulls(365)
-    end
-
     private def repo_checker(args)
       raise ArgumentError, "Must be called with repo argument. [:org/:repo]" if args.nil?
       if args.is_a? String

data/spec/factories/repo.rb

@@ -11,6 +11,14 @@ FactoryGirl.define do
     id 101010
     name "Hubstats"
     full_name "hub/hubstats"
-    initialize_with { attributes } 
+    initialize_with { attributes }
+  end
+
+  factory :repo_payload_hash, class:Hash do
+    id {Faker::Number.number(6).to_i}
+    type "RepositoryEvent"
+    association :user, factory: :user_hash, strategy: :build
+    association :repo, factory: :repo_hash, strategy: :build
+    initialize_with { attributes }
   end
 end

data/spec/lib/hubstats/events_handler_spec.rb

@@ -136,7 +136,79 @@ module Hubstats
         expect(Hubstats::Team).to receive(:create_or_update).and_return(team)
         ehandler.route(payload, "MembershipEvent")
       end
+
+      it 'should successfully remove a member from a team' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:team_payload_hash)
+        team = build(:team)
+        user = build(:user)
+        allow(Hubstats::User).to receive(:create_or_update).and_return(user)
+        allow(payload).to receive(:[]).with(:event).and_return(payload)
+        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One", :description => "Hubstats"})
+        allow(payload).to receive(:[]).with(:member).and_return(user)
+        allow(payload).to receive(:[]).with(:github_action).and_return("removed")
+        allow(payload).to receive(:[]).with(:scope).and_return("team")
+        allow(payload).to receive(:[]).with(:action).and_return("removed")
+        expect(Hubstats::Team).to receive(:update_users_in_team)
+        expect(Hubstats::Team).to receive(:create_or_update).and_return(team)
+        ehandler.route(payload, "MembershipEvent")
+      end
+
+      it 'should successfully delete a team' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:team_payload_hash)
+        team = build(:team)
+        user = build(:user)
+        allow(Hubstats::User).to receive(:create_or_update).and_return(user)
+        allow(payload).to receive(:[]).with(:event).and_return(payload)
+        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One", :description => "Hubstats"})
+        allow(payload).to receive(:[]).with(:member).and_return(user)
+        allow(payload).to receive(:[]).with(:github_action).and_return("removed")
+        allow(payload).to receive(:[]).with(:scope).and_return("organization")
+        allow(payload).to receive(:[]).with(:action).and_return("removed")
+        expect(Hubstats::Team).not_to receive(:update_users_in_team)
+        expect(Hubstats::Team).not_to receive(:create_or_update)
+        ehandler.route(payload, "MembershipEvent")
+      end
+
+      it 'should successfully rename a team' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:team_payload_hash)
+        team = build(:team)
+        user = build(:user)
+        allow(Hubstats::User).to receive(:create_or_update).and_return(user)
+        allow(payload).to receive(:[]).with(:event).and_return(payload)
+        allow(payload).to receive(:[]).with(:team).and_return({:name => "Team One", :description => "Hubstats"})
+        allow(payload).to receive(:[]).with(:sender).and_return(user)
+        allow(payload).to receive(:[]).with(:member).and_return(nil)
+        allow(payload).to receive(:[]).with(:scope).and_return(nil)
+        allow(payload).to receive(:[]).with(:github_action).and_return("edited")
+        allow(payload).to receive(:[]).with(:action).and_return("edited")
+        expect(Hubstats::Team).to receive(:update_users_in_team)
+        expect(Hubstats::Team).to receive(:create_or_update).and_return(team)
+        ehandler.route(payload, "MembershipEvent")
+      end
     end
 
+    context "RepositoryEvent" do
+      it 'should successfully route the repository' do
+        ehandler = EventsHandler.new()
+        payload = build(:repo_payload_hash)
+        expect(ehandler).to receive(:repository_processor)
+        ehandler.route(payload, payload[:type])
+      end
+
+      it 'should successfully process the repository' do
+        ehandler = Hubstats::EventsHandler.new()
+        payload = build(:repo_payload_hash)
+        allow(payload).to receive(:[]).with(:event).and_return(payload)
+        allow(payload).to receive(:[]).with(:repository).and_return({:full_name => "sportngin/test"})
+        allow(payload).to receive(:[]).with(:github_action).and_return("created")
+        allow(payload).to receive(:[]).with(:action).and_return("created")
+        expect(Hubstats::Repo).to receive(:create_or_update)
+        expect(Hubstats::GithubAPI).to receive(:create_repo_hook).and_return(true)
+        ehandler.route(payload, "RepositoryEvent")
+      end
+    end
   end
 end

data/spec/lib/hubstats/github_api_spec.rb

@@ -103,29 +103,6 @@ module Hubstats
       end
     end
 
-    context '.deprecate_teams' do
-      subject {Hubstats::GithubAPI}
-      let(:team1) {create(:team, :name => "Team One")}
-      let(:team2) {create(:team, :name => "Team Two")}
-      let(:team3) {create(:team, :name => "Team Three")}
-      let(:team4) {create(:team, :name => "Team Four")}
-      let(:team5) {create(:team, :name => "Team Five")}
-      let(:octokit_team) {double(:octokit_team, description: "Description for Hubstats")}
-      let(:client) {double(:octokit_client, team: octokit_team)}
-
-      before do
-        allow(octokit_team).to receive(:[]).with(:description).and_return("Description for Hubstats")
-      end
-
-      it 'should update the teams in the database based on a given whitelist' do
-        allow(Hubstats::Team).to receive(:all).and_return( [team1, team2, team3, team4, team5] )
-        allow(client).to receive(:team).and_return(octokit_team)
-        allow(subject).to receive(:client).and_return(client)
-        expect(team5).to receive(:update_column).with(:hubstats, false)
-        subject.deprecate_teams
-      end
-    end
-
     context ".create_repo_hook" do
       subject {Hubstats::GithubAPI}
       let(:config) {double(:webhook_secret => 'a1b2c3d4', :webhook_endpoint => "hubstats.com")}
@@ -134,6 +111,7 @@ module Hubstats
       before do
         allow(Hubstats).to receive(:config) {config}
         allow(subject).to receive(:client) {client}
+        allow(repo).to receive(:[]).with(:full_name)
       end
 
       it "should call octokit create_hook for repositories" do
@@ -167,6 +145,5 @@ module Hubstats
         subject.create_org_hook(org)
       end
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require File.expand_path("../../test/dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'factory_girl_rails'
 require 'faker'
+require 'test_response_patch'
+
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end
@@ -23,7 +25,7 @@ RSpec.configure do |config|
   # config.mock_with :rr
 
   config.include FactoryGirl::Syntax::Methods
-  
+
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   # config.fixture_path = "#{::Rails.root}/spec/fixtures"
 

data/spec/test_response_patch.rb

@@ -0,0 +1,14 @@
+# The suggestion for this file is from: https://github.com/rails/rails/issues/34790
+if RUBY_VERSION >= '2.6.0'
+  if Rails.version < '5'
+    class ActionController::TestResponse < ActionDispatch::TestResponse
+      def recycle!
+        @mon_mutex_owner_object_id = nil
+        @mon_mutex = nil
+        initialize
+      end
+    end
+  else
+    raise 'This monkey patch is no longer needed. Please remove this.'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.2.1
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,30 +29,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.18'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11.1
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.3.3
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.2
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +421,7 @@ files:
 - spec/models/hubstats/team_spec.rb
 - spec/models/hubstats/user_spec.rb
 - spec/spec_helper.rb
+- spec/test_response_patch.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -416,12 +473,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Github Statistics
@@ -454,6 +510,7 @@ test_files:
 - spec/models/hubstats/team_spec.rb
 - spec/models/hubstats/user_spec.rb
 - spec/spec_helper.rb
+- spec/test_response_patch.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js