commit 3658d38d73914f94f679dfa6feb50e186ab5050e
author Ash Wilson <smashwilson@gmail.com> Mon Sep 15 08:12:33 2014 -0400
committer Ash Wilson <smashwilson@gmail.com> Mon Sep 15 10:11:07 2014 -0400
tree adc902607f2dade472acdb7d1fb89c19b1521def
parent 3be15e13fc445bdf35e19e15e5345aa5ad3aa044

Rename `advance` to `fetchNextPage`.

collections.go

diff --git a/collections.go b/collections.go
index 1830ff0..258b47d 100644
--- a/collections.go
+++ b/collections.go
@@ -27,15 +27,15 @@
 type Pager struct {
 	initialURL string
 
-	advance func(string) (Page, error)
+	fetchNextPage func(string) (Page, error)
 }
 
 // NewPager constructs a manually-configured pager.
 // Supply the URL for the first page and a function that requests a specific page given a URL.
-func NewPager(initialURL string, advance func(string) (Page, error)) Pager {
+func NewPager(initialURL string, fetchNextPage func(string) (Page, error)) Pager {
 	return Pager{
-		initialURL: initialURL,
-		advance:    advance,
+		initialURL:    initialURL,
+		fetchNextPage: fetchNextPage,
 	}
 }
 
@@ -44,7 +44,7 @@
 func (p Pager) EachPage(handler func(Page) (bool, error)) error {
 	currentURL := p.initialURL
 	for {
-		currentPage, err := p.advance(currentURL)
+		currentPage, err := p.fetchNextPage(currentURL)
 		if err != nil {
 			return err
 		}
@@ -120,8 +120,8 @@
 	}
 
 	return Pager{
-		initialURL: "",
-		advance:    single,
+		initialURL:    "",
+		fetchNextPage: single,
 	}
 }
 
@@ -151,7 +151,7 @@
 
 // NewLinkedPager creates a Pager that uses a "links" element in the JSON response to locate the next page.
 func NewLinkedPager(initialURL string, request func(string) (http.Response, error)) Pager {
-	advance := func(url string) (Page, error) {
+	fetchNextPage := func(url string) (Page, error) {
 		resp, err := request(url)
 		if err != nil {
 			return nil, err
@@ -166,7 +166,7 @@
 	}
 
 	return Pager{
-		initialURL: initialURL,
-		advance:    advance,
+		initialURL:    initialURL,
+		fetchNextPage: fetchNextPage,
 	}
 }