Switch to Gem rest-client

Author: Thomas Osowski

hooks/ruby/dismiss-review-server/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 gem "json",        "~> 1.8"
 gem 'sinatra',     '~> 1.3.5'
+gem 'rest-client'

hooks/ruby/dismiss-review-server/Gemfile.lock

@@ -1,21 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    domain_name (0.5.20161129)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     json (1.8.6)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    netrc (0.11.0)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
+    rest-client (2.0.1)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.4.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   json (~> 1.8)
+  rest-client
   sinatra (~> 1.3.5)
 
 BUNDLED WITH

hooks/ruby/dismiss-review-server/server.rb

@@ -1,7 +1,6 @@
 require 'sinatra'
 require 'json'
-require 'uri'
-require 'net/http'
+require 'rest-client'
 
 $github_api_token = ENV['GITHUB_API_TOKEN']
 $github_secret_token = ENV['SECRET_TOKEN']
@@ -20,8 +19,8 @@
     parsed = JSON.parse(request.body.read)
 
     # Get branch information
-    branch_head = parsed['ref']
-    branch_name = branch_head.chomp("refs/heads")
+    branch_name = parsed['ref']
+    branch_name.slice!("refs/heads/")
 
     # Get Repository owner
     repo_owner = parsed["repository"]["owner"]["name"]
@@ -30,11 +29,10 @@
     # e.g. https://api.github.com/repos/baxterthehacker/public-repo/pulls{/number}
     pulls_url = parsed['repository']['pulls_url']
 
-    # Pull off the {/number}" and search for all Pull Requests
+    # Pull off the "{/number}" and search for all Pull Requests
     # that include the branch
     pulls_url_filtered = pulls_url.split('{').first + "?head=#{repo_owner}:#{branch_name}"
-    url =  URI(pulls_url_filtered)
-    pulls = get(url)
+    pulls = get(pulls_url_filtered)
 
     # parse pull requests
     if pulls.empty?
@@ -44,16 +42,15 @@
 
         # Get all Reviews for a Pull Request via API
         review_url_orig = pull_request["url"] + "/reviews"
-        review_url = URI(review_url_orig)
-        reviews = get(review_url)
+        reviews = get(review_url_orig)
 
         reviews.each do |review|
 
           # Dismiss all Reviews in 'APPROVED' state via API
           if review["state"] == "APPROVED"
             puts "INFO: found an approved Review"
             review_id = review["id"]
-            dismiss_url = URI(review_url_orig + "/#{review_id}/dismissals")
+            dismiss_url = review_url_orig + "/#{review_id}/dismissals"
             put(dismiss_url)
           end
         end.empty? and begin
@@ -70,43 +67,27 @@
 end
 
 def put(url)
-  http = Net::HTTP.new(url.host, url.port)
-  http.use_ssl = true
-  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-  request = Net::HTTP::Put.new(url)
-  request["authorization"] = "token #{$github_api_token}"
-  request["accept"] = 'application/vnd.github.black-cat-preview+json'
-  request["content"] = '0'
-  request["content-type"] = 'application/json'
-  request["cache-control"] = 'no-cache'
-  request.body = "{\n\t\"message\":\"Auto-dismissing\"\n}"
-
-  response = http.request(request)
-  if response.message != "OK"
-    []
-  else
-    JSON.parse(response.read_body)
-  end
+  jdata = JSON.generate({ message: "Auto-dismissing"})
+  headers = {
+    params:
+      {
+        access_token: $github_api_token
+      },
+    accept: "application/vnd.github.black-cat-preview+json"
+  }
+  response = RestClient.put(url, jdata, headers)
+  JSON.parse(response.body)
 end
 
 def get(url)
-  http = Net::HTTP.new(url.host, url.port)
-  http.use_ssl = true
-  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-  request = Net::HTTP::Get.new(url)
-  request["authorization"] = "token #{$github_api_token}"
-  # Use `application/vnd.github.v3+json` when Reviews is out of preview period
-  request["accept"] = 'application/vnd.github.black-cat-preview+json'
-  request["cache-control"] = 'no-cache'
-
-  response = http.request(request)
-  if response.message != "OK"
-    []
-  else
-    JSON.parse(response.read_body)
-  end
+  headers = {
+    params: {
+      access_token:  $github_api_token
+    },
+    accept: "application/vnd.github.black-cat-preview+json"
+  }
+  response = RestClient.get(url, headers)
+  JSON.parse(response.body)
 end
 
 def verify_signature(payload_body)