tojson nil check; example allows apikey

Author: mpholcomb

example/main.go

@@ -2,22 +2,29 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"strconv"
 
 	listennotes "github.com/ListenNotes/podcast-api-go"
 )
 
 func main() {
-	client := listennotes.NewClient("")
+	apiKey := os.Getenv("LISTEN_API_KEY")
+
+	client := listennotes.NewClient(apiKey)
 
 	// The test data will return the same page each time, but this is an example of getting the next_offset out fo the resulting payload
 	nextOffset := fetchAndOutputPage(client, 0)
 	fetchAndOutputPage(client, nextOffset)
 
 	// You can get the output json easily as well:
 	fmt.Printf("\nRegions:\n")
-	regions, _ := client.FetchPodcastRegions(nil)
-	fmt.Println(regions.ToJSON())
+	regions, err := client.FetchPodcastRegions(nil)
+	if err != nil {
+		fmt.Printf("Failed reading regions: %s\n", err)
+	} else {
+		fmt.Println(regions.ToJSON())
+	}
 }
 
 func fetchAndOutputPage(client listennotes.HTTPClient, offset int) int {
@@ -48,8 +55,8 @@ func fetchAndOutputPage(client listennotes.HTTPClient, offset int) int {
 	return nextOffset
 }
 
-// searchResults, _ := client.Search(map[string]string {"q": "star wars"});
+// searchResults, err := client.Search(map[string]string {"q": "star wars"});
 // fmt.Println(searchResults.ToJSON())
 
-// typeaheadResults, _ := client.Typeahead(map[string]string {"q": "star wars"});
+// typeaheadResults, err := client.Typeahead(map[string]string {"q": "star wars"});
 // fmt.Println(typeaheadResults.ToJSON())

execute.go

@@ -20,6 +20,9 @@ type Response struct {
 // Note: JSON marshal errors are swallowed here on purpose.  This is for ease of use.
 // Considering this data marshalled from JSON, the risk here is low.  On failure, "" will be returned.
 func (r *Response) ToJSON() string {
+	if r == nil {
+		return ""
+	}
 	jsonResult, err := json.Marshal(r.Data)
 	if err != nil {
 		log.Printf("failed to marshal response data to json: %s", err)

execute_test.go

@@ -189,6 +189,13 @@ func TestResponseJSON(t *testing.T) {
 		t.Errorf("ToJSON had unexpected result: '%s'", j)
 	}
 }
+func TestNilResponseJSON(t *testing.T) {
+	var resp *Response
+	j := resp.ToJSON()
+	if j != "" {
+		t.Errorf("ToJSON had unexpected respons: '%s'", j)
+	}
+}
 
 func TestResponseJSONParseFailure(t *testing.T) {
 	resp := Response{