Cosmetic fixes

Signed-off-by: Levi Gross <[email protected]>

Author: levigross

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2015 – Levi Gross
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,8 +1,6 @@
 # GRequests
 A Go "clone" of the great and famous Requests library
 
-# Build Status
-![Build Status](https://circleci.com/gh/levigross/grequests.png)
+![[Build Status](https://circleci.com/gh/levigross/grequests.png)(https://circleci.com/gh/levigross/grequests)]
 
-# Docs
-https://godoc.org/github.com/levigross/grequests
+[![GoDoc](https://godoc.org/github.com/levigross/grequests?status.svg)](https://godoc.org/github.com/levigross/grequests)

base.go

@@ -1,38 +1,25 @@
 // Package grequests implements a friendly API over Go's existing net/http library
 package grequests // import "github.com/levigross/grequests"
 
-// GET takes 2 parameters and returns a Response channel. These two options are:
+// Get takes 2 parameters and returns a Response channel. These two options are:
 // 1. A URL
 // 2. A RequestOptions struct
 // If you do not intend to use the `RequestOptions` you can just pass nil
 func Get(url string, ro *RequestOptions) chan *Response {
-	responseChan := make(chan *Response)
-	go func() {
-		responseChan <- buildResponse(buildRequest("GET", url, ro))
-	}()
-	return responseChan
+	return doRequest("GET", url, ro)
 }
 
 func Put(url string, ro *RequestOptions) chan *Response { return nil }
+
 func Post(url string, ro *RequestOptions) chan *Response {
-	responseChan := make(chan *Response)
-	go func() {
-		responseChan <- buildResponse(buildRequest("POST", url, ro))
-	}()
-	return responseChan
+	return doRequest("POST", url, ro)
 }
 func Delete(url string, ro *RequestOptions) chan *Response { return nil }
+
 func Head(url string, ro *RequestOptions) chan *Response {
-	responseChan := make(chan *Response)
-	go func() {
-		responseChan <- buildResponse(buildRequest("HEAD", url, ro))
-	}()
-	return responseChan
+	return doRequest("HEAD", url, ro)
 }
+
 func Options(url string, ro *RequestOptions) chan *Response {
-	responseChan := make(chan *Response)
-	go func() {
-		responseChan <- buildResponse(buildRequest("OPTIONS", url, ro))
-	}()
-	return responseChan
+	return doRequest("OPTIONS", url, ro)
 }

base_post_test.go

@@ -48,22 +48,21 @@ type BasicPostFileUpload struct {
 	Args  struct{} `json:"args"`
 	Data  string   `json:"data"`
 	Files struct {
-			  File string `json:"file"`
-		  } `json:"files"`
+		File string `json:"file"`
+	} `json:"files"`
 	Form    struct{} `json:"form"`
 	Headers struct {
-			  Accept_Encoding string `json:"Accept-Encoding"`
-			  Content_Length  string `json:"Content-Length"`
-			  Content_Type    string `json:"Content-Type"`
-			  Host            string `json:"Host"`
-			  User_Agent      string `json:"User-Agent"`
-		  } `json:"headers"`
+		Accept_Encoding string `json:"Accept-Encoding"`
+		Content_Length  string `json:"Content-Length"`
+		Content_Type    string `json:"Content-Type"`
+		Host            string `json:"Host"`
+		User_Agent      string `json:"User-Agent"`
+	} `json:"headers"`
 	JSON   interface{} `json:"json"`
 	Origin string      `json:"origin"`
 	URL    string      `json:"url"`
 }
 
-
 func TestBasicPostRequest(t *testing.T) {
 	verifyOkPostResponse(<-Post("http://httpbin.org/post",
 		&RequestOptions{Data: map[string]string{"One": "Two"}}), t)
@@ -80,7 +79,7 @@ func TestBasicPostRequestUpload(t *testing.T) {
 	defer fd.Close()
 
 	resp := <-Post("http://httpbin.org/post",
-		&RequestOptions{File: &FileUpload{FileName: "wonderful.exe", FileContents:fd}})
+		&RequestOptions{File: &FileUpload{FileName: "wonderful.exe", FileContents: fd}})
 
 	if resp.Error != nil {
 		t.Fatal("Unable to make request", resp.Error)
@@ -92,7 +91,6 @@ func TestBasicPostRequestUpload(t *testing.T) {
 
 	myJsonStruct := &BasicPostFileUpload{}
 
-
 	if err := resp.Json(myJsonStruct); err != nil {
 		t.Error("Unable to coerce to JSON", err)
 	}

request.go

@@ -43,6 +43,14 @@ type RequestOptions struct {
 	Auth []string
 }
 
+func doRequest(requestVerb, url string, ro *RequestOptions) chan *Response {
+	responseChan := make(chan *Response)
+	go func() {
+		responseChan <- buildResponse(buildRequest(requestVerb, url, ro))
+	}()
+	return responseChan
+}
+
 // buildRequest is where most of the magic happens for request processing
 func buildRequest(httpMethod, url string, ro *RequestOptions) (*http.Response, error) {
 	if ro == nil {