Skip to content

Commit a610c52

Browse files
jmervinejmervine
committed
Fixing for travis
1 parent b8c78c9 commit a610c52

File tree

4 files changed

+69
-75
lines changed

4 files changed

+69
-75
lines changed

‎examples_test.go

+47-49
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package maxcdn_test
1+
package maxcdn
22

33
// This file contains Example and Functional Example methods, both for documentation
44
// and for functionally testing code.
@@ -9,8 +9,6 @@ import (
99
"io/ioutil"
1010
"net/url"
1111
"os"
12-
13-
maxcdn "github.com/maxcdn/go-maxcdn"
1412
)
1513

1614
var (
@@ -21,8 +19,8 @@ var (
2119

2220
func Example() {
2321
// Basic Get
24-
max := maxcdn.NewMaxCDN(alias, token, secret)
25-
var got maxcdn.Generic
22+
max := NewMaxCDN(alias, token, secret)
23+
var got Generic
2624
res, err := max.Get(&got, "/account.json", nil)
2725
if err != nil {
2826
panic(err)
@@ -35,7 +33,7 @@ func Example() {
3533
form := url.Values{}
3634
form.Set("name", "new name")
3735

38-
var put maxcdn.Generic
36+
var put Generic
3937
if _, err = max.Put(&put, "/account.json", form); err == nil &&
4038
put["name"].(string) == "new name" {
4139
fmt.Println("name successfully updated")
@@ -55,15 +53,15 @@ func Example() {
5553
}
5654

5755
func Example_newMaxCDN() {
58-
max := maxcdn.NewMaxCDN(alias, token, secret)
56+
max := NewMaxCDN(alias, token, secret)
5957
fmt.Printf("%#v\n", max)
6058
}
6159

6260
func ExampleMaxCDN_doParse() {
6361
// Run mid-level DoParse method.
64-
max := maxcdn.NewMaxCDN(alias, token, secret)
62+
max := NewMaxCDN(alias, token, secret)
6563

66-
var data maxcdn.Generic
64+
var data Generic
6765
response, err := max.DoParse(&data, "GET", "/account.json/address", nil)
6866
if err != nil {
6967
panic(err)
@@ -75,12 +73,12 @@ func ExampleMaxCDN_doParse() {
7573

7674
func ExampleMaxCDN_do() {
7775
// Run low-level Do method.
78-
max := maxcdn.NewMaxCDN(alias, token, secret)
76+
max := NewMaxCDN(alias, token, secret)
7977

8078
if rsp, err := max.Do("GET", "/account.json", nil); err == nil {
8179
fmt.Printf("Response Code: %d\n", rsp.Code)
8280

83-
var data maxcdn.Generic
81+
var data Generic
8482
if err = json.Unmarshal(rsp.Data, &data); err == nil {
8583
fmt.Printf("%+v\n", data["account"])
8684
}
@@ -89,7 +87,7 @@ func ExampleMaxCDN_do() {
8987

9088
func ExampleMaxCDN_request() {
9189
// Run low-level Request method.
92-
max := maxcdn.NewMaxCDN(alias, token, secret)
90+
max := NewMaxCDN(alias, token, secret)
9391

9492
check := func(e error) {
9593
if e != nil {
@@ -108,9 +106,9 @@ func ExampleMaxCDN_request() {
108106
}
109107

110108
func ExampleMaxCDN_get() {
111-
max := maxcdn.NewMaxCDN(alias, token, secret)
109+
max := NewMaxCDN(alias, token, secret)
112110

113-
var data maxcdn.Generic
111+
var data Generic
114112
response, err := max.Get(&data, "/account.json/address", nil)
115113
if err != nil {
116114
panic(err)
@@ -121,7 +119,7 @@ func ExampleMaxCDN_get() {
121119
}
122120

123121
func ExampleMaxCDN_getLogs() {
124-
max := maxcdn.NewMaxCDN(alias, token, secret)
122+
max := NewMaxCDN(alias, token, secret)
125123
if logs, err := max.GetLogs(nil); err == nil {
126124
for _, line := range logs.Records {
127125
fmt.Printf("%+v\n", line)
@@ -130,12 +128,12 @@ func ExampleMaxCDN_getLogs() {
130128
}
131129

132130
func ExampleMaxCDN_put() {
133-
max := maxcdn.NewMaxCDN(alias, token, secret)
131+
max := NewMaxCDN(alias, token, secret)
134132

135133
form := url.Values{}
136134
form.Set("name", "example name")
137135

138-
var data maxcdn.Generic
136+
var data Generic
139137
response, err := max.Put(&data, "/account.json", form)
140138
if err != nil {
141139
panic(err)
@@ -148,7 +146,7 @@ func ExampleMaxCDN_put() {
148146
func ExampleMaxCDN_delete() {
149147
// This specific example shows how to purge a cache without using the Purge
150148
// methods, more as an example of using Delete, then anything, really.
151-
max := maxcdn.NewMaxCDN(alias, token, secret)
149+
max := NewMaxCDN(alias, token, secret)
152150

153151
res, err := max.Delete("/zones/pull.json/123456/cache", nil)
154152
if err != nil {
@@ -161,7 +159,7 @@ func ExampleMaxCDN_delete() {
161159
}
162160

163161
func ExampleMaxCDN_purgeZone() {
164-
max := maxcdn.NewMaxCDN(alias, token, secret)
162+
max := NewMaxCDN(alias, token, secret)
165163

166164
rsp, err := max.PurgeZone(123456)
167165
if err != nil {
@@ -174,7 +172,7 @@ func ExampleMaxCDN_purgeZone() {
174172
}
175173

176174
func ExampleMaxCDN_purgeZones() {
177-
max := maxcdn.NewMaxCDN(alias, token, secret)
175+
max := NewMaxCDN(alias, token, secret)
178176

179177
zones := []int{123456, 234567, 345678}
180178
rsps, err := max.PurgeZones(zones)
@@ -188,7 +186,7 @@ func ExampleMaxCDN_purgeZones() {
188186
}
189187

190188
func ExampleMaxCDN_purgeFile() {
191-
max := maxcdn.NewMaxCDN(alias, token, secret)
189+
max := NewMaxCDN(alias, token, secret)
192190

193191
payload, err := max.PurgeFile(123456, "/master.css")
194192
if err != nil {
@@ -201,7 +199,7 @@ func ExampleMaxCDN_purgeFile() {
201199
}
202200

203201
func ExampleMaxCDN_purgeFiles() {
204-
max := maxcdn.NewMaxCDN(alias, token, secret)
202+
max := NewMaxCDN(alias, token, secret)
205203

206204
files := []string{"/master.css", "/master.js"}
207205
payloads, err := max.PurgeFiles(123456, files)
@@ -215,15 +213,15 @@ func ExampleMaxCDN_purgeFiles() {
215213
}
216214

217215
func ExampleMaxCDN_post() {
218-
max := maxcdn.NewMaxCDN(alias, token, secret)
216+
max := NewMaxCDN(alias, token, secret)
219217

220218
form := url.Values{}
221219
form.Set("name", "newzone")
222220

223221
// When creating a new zone, the url must be real and resolve.
224222
form.Set("url", "http://www.example.com")
225223

226-
var data maxcdn.Generic
224+
var data Generic
227225
_, err := max.Post(&data, "/zones/pull.json", form)
228226
if err != nil {
229227
panic(err)
@@ -235,17 +233,17 @@ func ExampleMaxCDN_post() {
235233
}
236234

237235
func Example_response() {
238-
max := maxcdn.NewMaxCDN(alias, token, secret)
236+
max := NewMaxCDN(alias, token, secret)
239237

240-
var data maxcdn.Generic
238+
var data Generic
241239
response, _ := max.Get(&data, "/account.json", nil)
242240
fmt.Printf("%+v\n", response)
243241
}
244242

245243
func Example_generic() {
246-
max := maxcdn.NewMaxCDN(alias, token, secret)
244+
max := NewMaxCDN(alias, token, secret)
247245

248-
var data maxcdn.Generic
246+
var data Generic
249247
if _, err := max.Get(&data, "/account.json", nil); err == nil {
250248
alias := data["alias"].(string)
251249
name := data["name"].(string)
@@ -255,27 +253,27 @@ func Example_generic() {
255253
}
256254

257255
func Example_account() {
258-
max := maxcdn.NewMaxCDN(alias, token, secret)
256+
max := NewMaxCDN(alias, token, secret)
259257

260-
var data maxcdn.Generic
258+
var data Generic
261259
if _, err := max.Get(&data, "/account.json", nil); err == nil {
262260
fmt.Printf("%+v\n", data)
263261
}
264262
}
265263

266264
func Example_accountAddress() {
267-
max := maxcdn.NewMaxCDN(alias, token, secret)
265+
max := NewMaxCDN(alias, token, secret)
268266

269-
var data maxcdn.Generic
267+
var data Generic
270268
if _, err := max.Get(&data, "/account.json/address", nil); err == nil {
271269
fmt.Printf("%+v\n", data)
272270
}
273271
}
274272

275273
func Example_popularFiles() {
276-
max := maxcdn.NewMaxCDN(alias, token, secret)
274+
max := NewMaxCDN(alias, token, secret)
277275

278-
var data maxcdn.Generic
276+
var data Generic
279277
if _, err := max.Get(&data, "/reports/popularfiles.json", nil); err == nil {
280278
for i, file := range data {
281279
uri := file.(map[string]interface{})["uri"].(string)
@@ -289,18 +287,18 @@ func Example_popularFiles() {
289287
}
290288

291289
func Example_statsSummary() {
292-
max := maxcdn.NewMaxCDN(alias, token, secret)
290+
max := NewMaxCDN(alias, token, secret)
293291

294-
var data maxcdn.Generic
292+
var data Generic
295293
if _, err := max.Get(&data, "/reports/stats.json", nil); err == nil {
296294
fmt.Printf("%+v\n", data)
297295
}
298296
}
299297

300298
func Example_stats() {
301-
max := maxcdn.NewMaxCDN(alias, token, secret)
299+
max := NewMaxCDN(alias, token, secret)
302300

303-
var data maxcdn.Generic
301+
var data Generic
304302
if _, err := max.Get(&data, "/reports/stats.json/hourly", nil); err == nil {
305303
fmt.Printf("%+v\n", data)
306304
}
@@ -319,14 +317,14 @@ func Example_functional() {
319317
var form url.Values
320318

321319
name := stringFromTimestamp()
322-
max := maxcdn.NewMaxCDN(alias, token, secret)
320+
max := NewMaxCDN(alias, token, secret)
323321

324322
if alias == "" || token == "" || secret == "" {
325323
max.HTTPClient = stubHTTPOk()
326324
}
327325

328326
// GET /account.json
329-
var getAcct maxcdn.Generic
327+
var getAcct Generic
330328
res, err := max.Get(&getAcct, "/account.json", nil)
331329
if err != nil || res.Code != 200 ||
332330
getAcct["account"].(map[string]interface{})["name"].(string) == "" {
@@ -337,7 +335,7 @@ func Example_functional() {
337335
}
338336

339337
// PUT /account.json
340-
var putAcct maxcdn.Generic
338+
var putAcct Generic
341339
form = url.Values{}
342340
form.Set("name", name)
343341
res, err = max.Put(&putAcct, "/account.json", form)
@@ -350,7 +348,7 @@ func Example_functional() {
350348
}
351349

352350
// GET /account.json/address
353-
var getAddr maxcdn.Generic
351+
var getAddr Generic
354352
res, err = max.Get(&getAddr, "/account.json/address", nil)
355353
if err != nil || res.Code != 200 ||
356354
getAddr["address"].(map[string]interface{})["street1"].(string) == "" {
@@ -361,7 +359,7 @@ func Example_functional() {
361359
}
362360

363361
// PUT /account.json/address
364-
var putAddr maxcdn.Generic
362+
var putAddr Generic
365363
form = url.Values{}
366364
form.Set("street1", name)
367365
res, err = max.Put(&putAddr, "/account.json/address", form)
@@ -374,7 +372,7 @@ func Example_functional() {
374372
}
375373

376374
// GET /reports/popularfiles.json
377-
var popular maxcdn.Generic
375+
var popular Generic
378376
res, err = max.Get(&popular, "/reports/popularfiles.json", nil)
379377
if err != nil || res.Code != 200 ||
380378
popular["popularfiles"].([]interface{})[0].(map[string]interface{})["uri"].(string) == "" {
@@ -387,7 +385,7 @@ func Example_functional() {
387385
file := popular["popularfiles"].([]interface{})[0].(map[string]interface{})["uri"].(string)
388386

389387
// GET /reports/stats.json
390-
var stats maxcdn.Generic
388+
var stats Generic
391389
res, err = max.Get(&stats, "/reports/stats.json", nil)
392390
if err != nil || res.Code != 200 || stats["total"] == "" {
393391
fmt.Println("GET stats")
@@ -397,7 +395,7 @@ func Example_functional() {
397395
}
398396

399397
// GET /reports/stats.json/daily
400-
var daily maxcdn.Generic
398+
var daily Generic
401399
res, err = max.Get(&daily, "/reports/stats.json/daily", nil)
402400
if err != nil || res.Code != 200 || daily["total"] == "" {
403401
fmt.Println("GET stats/daily")
@@ -407,7 +405,7 @@ func Example_functional() {
407405
}
408406

409407
// GET /zones/pull.json
410-
var getPulls maxcdn.Generic
408+
var getPulls Generic
411409
res, err = max.Get(&getPulls, "/zones/pull.json", nil)
412410
if err != nil || res.Code != 200 ||
413411
getPulls["pullzones"].([]interface{})[0].(map[string]interface{})["id"].(string) == "" {
@@ -420,7 +418,7 @@ func Example_functional() {
420418
// note: order matters for the rest
421419

422420
// POST /zones/pull.json
423-
var postPull maxcdn.Generic
421+
var postPull Generic
424422
form = url.Values{}
425423
form.Set("name", name)
426424
form.Set("url", "http://www.example.com")
@@ -436,7 +434,7 @@ func Example_functional() {
436434
id := int(postPull["pullzone"].(map[string]interface{})["id"].(float64))
437435

438436
// GET /zones/pull.json/{{zone_id}}
439-
var getPull maxcdn.Generic
437+
var getPull Generic
440438
endpoint := fmt.Sprintf("/zones/pull.json/%d", id)
441439
res, err = max.Get(&getPull, endpoint, nil)
442440
if err != nil || res.Code != 200 ||

‎helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file contains helper methods for testing.
22

3-
package maxcdn_test
3+
package maxcdn
44

55
import (
66
"bytes"

0 commit comments

Comments
 (0)