upgrade GitHub to use newest HTTP

Author: KristofferC

.travis.yml

@@ -11,8 +11,8 @@ addons:
     - hdf5-tools
 
 sudo: false
-#script:
-#    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-#    - julia -e 'Pkg.clone(pwd()); Pkg.build("GitHub"); Pkg.test("GitHub"; coverage=true)';
+script:
+    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+    - julia -e 'Pkg.clone(pwd()); Pkg.build("GitHub"); Pkg.checkout("HTTP"); Pkg.test("GitHub"; coverage=true)';
 after_success:
     - julia -e 'cd(Pkg.dir("GitHub")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

REQUIRE

@@ -3,4 +3,3 @@ julia 0.6
 JSON
 MbedTLS
 HTTP 0.5.4
-HttpCommon # for deprecations

src/GitHub.jl

@@ -16,8 +16,7 @@ const ?{T} = Union{T, Nothing}
 
 import HTTP,
        JSON,
-       MbedTLS,
-       HttpCommon # for deprecations
+       MbedTLS
 
 #############
 # Utilities #

src/activity/events.jl

@@ -35,15 +35,15 @@ end
 # Validation Functions #
 ########################
 
-has_event_header(request::HTTP.Request) = haskey(HTTP.headers(request), "X-Github-Event")
-event_header(request::HTTP.Request) = HTTP.headers(request)["X-Github-Event"]
+has_event_header(request::HTTP.Request) = HTTP.hasheader(request, "X-Github-Event")
+event_header(request::HTTP.Request) = HTTP.header(request, "X-Github-Event")
 
-has_sig_header(request::HTTP.Request) = haskey(HTTP.headers(request), "X-Hub-Signature")
-sig_header(request::HTTP.Request) = HTTP.headers(request)["X-Hub-Signature"]
+has_sig_header(request::HTTP.Request) = HTTP.hasheader(request, "X-Hub-Signature")
+sig_header(request::HTTP.Request) = HTTP.header(request, "X-Hub-Signature")
 
 function has_valid_secret(request::HTTP.Request, secret)
     if has_sig_header(request)
-        secret_sha = "sha1="*bytes2hex(MbedTLS.digest(MbedTLS.MD_SHA1, String(request), secret))
+        secret_sha = "sha1="*bytes2hex(MbedTLS.digest(MbedTLS.MD_SHA1, HTTP.load(request), secret))
         return sig_header(request) == secret_sha
     end
     return false
@@ -62,7 +62,7 @@ end
 #################
 
 struct EventListener
-    server::HTTP.Server
+    server::HTTP.Servers.Server
     repos
     events
     function EventListener(handle; auth::Authorization = AnonymousAuth(),
@@ -76,7 +76,7 @@ struct EventListener
             repos = map(name, repos)
         end
 
-        server = HTTP.Server() do request, response
+        server = HTTP.Servers.Server() do request, response
             try
                 handle_event_request(request, handle; auth = auth,
                                      secret = secret, events = events,
@@ -98,17 +98,17 @@ function handle_event_request(request, handle;
                               secret = nothing, events = nothing,
                               repos = nothing, forwards = nothing)
     if !(isa(secret, Void)) && !(has_valid_secret(request, secret))
-        return HTTP.Response(400, "invalid signature")
+        return HTTP.Response(400)
     end
 
     if !(isa(events, Void)) && !(is_valid_event(request, events))
-        return HTTP.Response(204, "event ignored")
+        return HTTP.Response(204)
     end
 
-    event = event_from_payload!(event_header(request), JSON.parse(String(request)))
+    event = event_from_payload!(event_header(request), JSON.parse(HTTP.load(request)))
 
     if !(isa(repos, Void)) && !(from_valid_repo(event, repos))
-        return HTTP.Response(400, "invalid repo")
+        return HTTP.Response(400)
     end
 
     if !(isa(forwards, Void))
@@ -117,14 +117,7 @@ function handle_event_request(request, handle;
         end
     end
 
-    retval = handle(event)
-    if retval isa HttpCommon.Response
-        Base.depwarn("event handlers should return an `HTTP.Response` instead of an `HttpCommon.Response`,
-                 making a best effort to convert to an `HTTP.Response`", :handle_event_request)
-        retval = HTTP.Response(; status = retval.status, headers = convert(Dict{String, String}, retval.headers),
-                                 body = HTTP.FIFOBuffer(retval.data))
-    end
-    return retval
+    return handle(event)
 end
 
 function Base.run(listener, args...; host = nothing, port = nothing, kwargs...)
@@ -138,7 +131,7 @@ function Base.run(listener::EventListener, host::HTTP.IPAddr, port::Int, args...
     println("Listening for GitHub events sent to $port;")
     println("Whitelisted events: $(isa(listener.events, Void) ? "All" : listener.events)")
     println("Whitelisted repos: $(isa(listener.repos, Void) ? "All" : listener.repos)")
-    return HTTP.serve(listener.server, host, port, args...; kwargs...)
+    return HTTP.Servers.serve(listener.server, host, port, args...; kwargs...)
 end
 
 ###################

src/apps/installations.jl

@@ -24,5 +24,5 @@ end
     headers["Accept"] = "application/vnd.github.machine-man-preview+json"
     results, page_data = github_paged_get(api, "/installation/repositories";
         headers=headers, options...)
-    mapreduce(x->map(Repo, JSON.parse(String(x))["repositories"]), vcat, Repo[], results), page_data
+    mapreduce(x->map(Repo, JSON.parse(HTTP.load(x))["repositories"]), vcat, Repo[], results), page_data
 end

src/git/blob.jl

@@ -9,7 +9,7 @@ end
 Blob(data::Dict) = json2github(Blob, data)
 Blob(sha::AbstractString) = Blob(Dict("sha" => sha))
 
-namefield(blob::Blob) = blob.sha
+name(blob::Blob) = blob.sha
 
 @api_default function blob(api::GitHubAPI, repo, blob_obj; options...)
     result = gh_get_json(api, "/repos/$(name(repo))/git/blobs/$(name(blob_obj))"; options...)

src/git/gitcommit.jl

@@ -10,7 +10,7 @@ mutable struct GitCommit <: GitHubType
 end
 
 GitCommit(data::Dict) = json2github(GitCommit, data)
-namefield(gitcommit::GitCommit) = gitcommit.sha
+name(gitcommit::GitCommit) = gitcommit.sha
 
 @api_default function gitcommit(api::GitHubAPI, repo, commit_obj; options...)
     result = gh_get_json(api, "/repos/$(name(repo))/git/commits/$(name(commit_obj))"; options...)

src/git/reference.jl

@@ -6,7 +6,7 @@ end
 
 Reference(data::Dict) = json2github(Reference, data)
 
-name(ref::Reference) = String(split(get(ref.ref), "refs/")[2])
+name(ref::Reference) = String(split(ref.ref, "refs/")[2])
 
 @api_default function reference(api::GitHubAPI, repo, ref_obj; options...)
     result = gh_get_json(api, "/repos/$(name(repo))/git/refs/$(name(ref_obj))"; options...)

src/git/tag.jl

@@ -9,7 +9,7 @@ mutable struct Tag <: GitHubType
 end
 
 Tag(data::Dict) = json2github(Tag, data)
-namefield(tag::Tag) = tag.sha
+name(tag::Tag) = tag.sha
 
 @api_default function tag(api::GitHubAPI, repo, tag_obj; options...)
     result = gh_get_json(api, "/repos/$(name(repo))/git/tags/$(name(tag_obj))"; options...)

src/git/tree.jl

@@ -6,7 +6,7 @@ mutable struct Tree <: GitHubType
 end
 
 Tree(data::Dict) = json2github(Tree, data)
-namefield(tree::Tree) = tree.sha
+name(tree::Tree) = tree.sha
 
 @api_default function tree(api::GitHubAPI, repo, tree_obj; options...)
     result = gh_get_json(api, "/repos/$(name(repo))/git/trees/$(name(tree_obj))"; options...)