Rename package to

Author: saopayne

Makefile

@@ -12,7 +12,7 @@ Go library to access GoCardless API. This library provides a simple wrapper arou
 ## Getting started
 
 ```
-go get 'https://github.com/saopayne/gocardless-pro-go'
+go get github.com/saopayne/gocardless
 ```
 
 ## Initializing the client

README.md

@@ -582,4 +582,14 @@ if err != nil {
     fmt.Sprintf("The error while canceling a subscription is :%s", err.Error())
 }
 fmt.Sprintf("The subscription canceled returned the response: %s ", subToCancel)
+
+//list all subscriptions
+subscriptionsListReq := &SubscriptionListRequest{
+    Limit: 100,
+}
+// list all subscriptions
+_, err := client.Subscription.ListSubscriptions(subscriptionsListReq)
+if err != nil {
+    fmt.Sprintf("The error while getting list of subscriptions  is :%s", err.Error())
+}
 ```

Usage.md

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"fmt"

bank_details_lookup.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

creditor.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"fmt"

creditor_bank_account.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

customer.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

customer_bank_account.go

@@ -1 +1 @@
-package main
+package gocardless

doc.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"fmt"

error.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"fmt"

event.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"bytes"
@@ -28,26 +28,26 @@ const (
 	acceptJsonType       = "application/json"
 )
 
-func main() {
-
-	apiKey := "sandbox_o55p5OowBX59Rd8aDR7c_25LQdBTHRaACeVnqj0o"
-
-	//second param is an optional http client, allowing overriding of the HTTP client to use.
-	//This is useful if you're running in a Google AppEngine environment
-	//where the http.DefaultClient is not available.
-	client := NewClient(apiKey, nil)
-	client.LoggingEnabled = true
-
-	payoutsListReq := &PayoutListRequest{
-		Limit: 100,
-	}
-	// list all payouts
-	_, err := client.Payout.ListPayouts(payoutsListReq)
-	if err != nil {
-		fmt.Sprintf("The error while getting list of payouts  is :%s", err.Error())
-	}
-
-}
+//func main() {
+//
+//	apiKey := "sandbox_o55p5OowBX59Rd8aDR7c_25LQdBTHRaACeVnqj0o"
+//
+//	//second param is an optional http client, allowing overriding of the HTTP client to use.
+//	//This is useful if you're running in a Google AppEngine environment
+//	//where the http.DefaultClient is not available.
+//	client := NewClient(apiKey, nil)
+//	client.LoggingEnabled = true
+//
+//	subscriptionsListReq := &SubscriptionListRequest{
+//		Limit: 100,
+//	}
+//	// list all subscriptions
+//	_, err := client.Subscription.ListSubscriptions(subscriptionsListReq)
+//	if err != nil {
+//		fmt.Sprintf("The error while getting list of subscriptions  is :%s", err.Error())
+//	}
+//
+//}
 
 type service struct {
 	client *Client

gocardless.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 type CreditorLink struct {
 	Creditor string `json:"creditor,omitempty"`

link.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

mandate.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

mandate_pdf.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

payment.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"fmt"

payout.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"fmt"

redirect_flow.go

@@ -1,4 +1,4 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"

refund.go

@@ -1,9 +1,11 @@
-package main
+package gocardless
 
 import (
 	"encoding/json"
 	"fmt"
-	"net/url"
+	"log"
+	"net/http"
+	"os"
 )
 
 type SubscriptionService service
@@ -92,24 +94,26 @@ func (s *SubscriptionService) CreateSubscription(subscriptionReq *SubscriptionCr
 
 // List returns a list of subscriptions
 func (s *SubscriptionService) ListSubscriptions(req *SubscriptionListRequest) (*SubscriptionList, error) {
-	return s.ListNSubscriptions(10, 0, req)
-}
-
-func (s *SubscriptionService) ListNSubscriptions(count, offset int, req *SubscriptionListRequest) (*SubscriptionList, error) {
-	params := url.Values{}
-	params.Add("after", req.After)
-	params.Add("before", req.Before)
-	params.Add("created_at[gt]", req.CreatedAt.Gt)
-	params.Add("created_at[gte]", req.CreatedAt.Gte)
-	params.Add("created_at[lt]", req.CreatedAt.Lt)
-	params.Add("created_at[lte]", req.CreatedAt.Lte)
-	params.Add("limit", string(req.Limit))
-	params.Add("mandate", req.Mandate)
-	params.Add("customer", req.Customer)
-
-	u := paginateURL("/subscriptions", count, offset)
+	reqd, err := http.NewRequest("GET", "/subscriptions", nil)
+	if err != nil {
+		log.Print(err)
+		os.Exit(1)
+	}
+	params := reqd.URL.Query()
+	if req.After != "" { params.Add("after", req.After) }
+	if req.Before != "" { params.Add("before", req.Before) }
+	if req.CreatedAt.Gt != "" { params.Add("created_at[gt]", req.CreatedAt.Gt) }
+	if req.CreatedAt.Gte != "" { params.Add("created_at[gte]", req.CreatedAt.Gte) }
+	if req.CreatedAt.Lt != "" { params.Add("created_at[lt]", req.CreatedAt.Lt) }
+	if req.CreatedAt.Lte != "" { params.Add("created_at[lte]", req.CreatedAt.Lte) }
+	if req.Limit > 0 { params.Add("limit", string(req.Limit)) }
+	if req.Mandate != "" { params.Add("mandate", req.Mandate) }
+	if req.Customer != "" { params.Add("customer", req.Customer) }
+
+	reqd.URL.RawQuery = params.Encode()
+	path := reqd.URL.String()
 	subscriptions := &SubscriptionList{}
-	err := s.client.Call("GET", u, params, subscriptions)
+	err = s.client.Call("GET", path, nil, subscriptions)
 
 	return subscriptions, err
 }