From 6b2b5a0ea33aa42044724296322a9ced02a3abcc Mon Sep 17 00:00:00 2001
From: Justin Tulloss <justin.tulloss@gmail.com>
Date: Sun, 23 Nov 2014 12:45:42 -0800
Subject: [PATCH] Replace Init with NewClient

This is slightly more idiomatic go. Instead of creating a struct and
passing it to Init, we replace Init with NewClient which both creates
the struct and initializes it.
---
 firebase.go      |  6 ++----
 firebase_test.go | 24 ++++++++----------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/firebase.go b/firebase.go
index abcd049..93dc6f1 100644
--- a/firebase.go
+++ b/firebase.go
@@ -56,14 +56,12 @@ var httpClient = newTimeoutClient(connectTimeout, readWriteTimeout)
 
 // Init initializes the Firebase client with a given root url and optional auth token.
 // The initialization can also pass a mock api for testing purposes.
-func (c *Client) Init(root, auth string, api Api) {
+func NewClient(root, auth string, api Api) *Client {
 	if api == nil {
 		api = new(f)
 	}
 
-	c.api = api
-	c.Url = root
-	c.Auth = auth
+	return &Client{Url: root, Auth: auth, api: api, value: nil}
 }
 
 // Value returns the value of of the current Url.
diff --git a/firebase_test.go b/firebase_test.go
index 16e3378..3709b65 100644
--- a/firebase_test.go
+++ b/firebase_test.go
@@ -22,8 +22,7 @@ var (
 )
 
 func TestValue(t *testing.T) {
-	client := new(Client)
-	client.Init(testUrl+"/tests", testAuth, nil)
+	client := NewClient(testUrl+"/tests", testAuth, nil)
 
 	r := client.Value()
 
@@ -33,8 +32,7 @@ func TestValue(t *testing.T) {
 }
 
 func TestChild(t *testing.T) {
-	client := new(Client)
-	client.Init(testUrl+"/tests", testAuth, nil)
+	client := NewClient(testUrl+"/tests", testAuth, nil)
 
 	r := client.Child("", nil, nil)
 
@@ -44,8 +42,7 @@ func TestChild(t *testing.T) {
 }
 
 func TestPush(t *testing.T) {
-	client := new(Client)
-	client.Init(testUrl+"/tests", testAuth, nil)
+	client := NewClient(testUrl+"/tests", testAuth, nil)
 
 	name := &Name{First: "FirstName", Last: "LastName"}
 
@@ -61,8 +58,7 @@ func TestPush(t *testing.T) {
 }
 
 func TestSet(t *testing.T) {
-	c1 := new(Client)
-	c1.Init(testUrl+"/tests/users", testAuth, nil)
+	c1 := NewClient(testUrl+"/tests/users", testAuth, nil)
 
 	name := &Name{First: "First", Last: "last"}
 	c2, _ := c1.Push(name, nil)
@@ -80,8 +76,7 @@ func TestSet(t *testing.T) {
 }
 
 func TestUpdate(t *testing.T) {
-	c1 := new(Client)
-	c1.Init(testUrl+"/tests/users", testAuth, nil)
+	c1 := NewClient(testUrl+"/tests/users", testAuth, nil)
 
 	name := &Name{First: "First", Last: "last"}
 	c2, _ := c1.Push(name, nil)
@@ -95,8 +90,7 @@ func TestUpdate(t *testing.T) {
 }
 
 func TestRemovet(t *testing.T) {
-	c1 := new(Client)
-	c1.Init(testUrl+"/tests/users", testAuth, nil)
+	c1 := NewClient(testUrl+"/tests/users", testAuth, nil)
 
 	name := &Name{First: "First", Last: "last"}
 	c2, _ := c1.Push(name, nil)
@@ -109,8 +103,7 @@ func TestRemovet(t *testing.T) {
 }
 
 func TestRules(t *testing.T) {
-	client := new(Client)
-	client.Init(testUrl, testAuth, nil)
+	client := NewClient(testUrl, testAuth, nil)
 
 	r, err := client.Rules(nil)
 
@@ -124,8 +117,7 @@ func TestRules(t *testing.T) {
 }
 
 func TestSetRules(t *testing.T) {
-	client := new(Client)
-	client.Init(testUrl, testAuth, nil)
+	client := NewClient(testUrl, testAuth, nil)
 
 	rules := &Rules{
 		"rules": map[string]string{