Moved view code into a new file.

couchbase · Jan 21, 2013 · 2d44152 · 2d44152
1 parent acd707e
commit 2d44152
Show file tree

Hide file tree

Showing 2 changed files with 132 additions and 126 deletions.
diff --git a/client.go b/client.go
@@ -23,9 +23,7 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"math/rand"
 	"net/http"
-	"net/url"
 	"sync"
 	"sync/atomic"
 
@@ -407,130 +405,6 @@ func (b *Bucket) Update(k string, exp int, callback UpdateFunc) error {
 	})
 }
 
-type ViewRow struct {
-	ID    string
-	Key   interface{}
-	Value interface{}
-	Doc   *interface{}
-}
-
-type ViewError struct {
-	From   string
-	Reason string
-}
-
-func (ve ViewError) Error() string {
-	return fmt.Sprintf("Node: %v, reason: %v", ve.From, ve.Reason)
-}
-
-type ViewResult struct {
-	TotalRows int `json:"total_rows"`
-	Rows      []ViewRow
-	Errors    []ViewError
-}
-
-func (b *Bucket) randomBaseURL() (*url.URL, error) {
-	node := b.Nodes[rand.Intn(len(b.Nodes))]
-	return url.Parse(node.CouchAPIBase)
-}
-
-// Document ID type for the startkey_docid parameter in views.
-type DocId string
-
-// Build a URL for a view with the given ddoc, view name, and
-// parameters.
-func (b *Bucket) ViewURL(ddoc, name string,
-	params map[string]interface{}) (string, error) {
-	u, err := b.randomBaseURL()
-	if err != nil {
-		return "", err
-	}
-
-	values := url.Values{}
-	for k, v := range params {
-		switch t := v.(type) {
-		case DocId:
-			values[k] = []string{string(t)}
-		case string:
-			values[k] = []string{fmt.Sprintf(`"%s"`, t)}
-		case int:
-			values[k] = []string{fmt.Sprintf(`%d`, t)}
-		case bool:
-			values[k] = []string{fmt.Sprintf(`%v`, t)}
-		default:
-			b, err := json.Marshal(v)
-			if err != nil {
-				panic(fmt.Sprintf("unsupported value-type %T in Query, json encoder said %v",
-					t, err))
-			}
-			values[k] = []string{fmt.Sprintf(`%v`, string(b))}
-		}
-	}
-
-	if ddoc == "" && name == "_all_docs" {
-		u.Path = fmt.Sprintf("/%s/_all_docs", b.Name)
-	} else {
-		u.Path = fmt.Sprintf("/%s/_design/%s/_view/%s", b.Name, ddoc, name)
-	}
-	u.RawQuery = values.Encode()
-
-	return u.String(), nil
-}
-
-// Perform a view request that can map row values to a custom type.
-//
-// See the source to View for an example usage.
-func (b *Bucket) ViewCustom(ddoc, name string, params map[string]interface{},
-	vres interface{}) error {
-
-	u, err := b.ViewURL(ddoc, name, params)
-	if err != nil {
-		return err
-	}
-
-	res, err := HttpClient.Get(u)
-	if err != nil {
-		return fmt.Errorf("Error starting view req at %v: %v", u, err)
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		bod := make([]byte, 512)
-		l, _ := res.Body.Read(bod)
-		return fmt.Errorf("Error executing view req at %v: %v - %s",
-			u, res.Status, bod[:l])
-	}
-
-	d := json.NewDecoder(res.Body)
-	if err := d.Decode(vres); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Execute a view.
-//
-// The ddoc parameter is just the bare name of your design doc without
-// the "_design/" prefix.
-//
-// Parameters are string keys with values that correspond to couchbase
-// view parameters.  Primitive should work fairly naturally (booleans,
-// ints, strings, etc...) and other values will attempt to be JSON
-// marshaled (useful for array indexing on on view keys, for example).
-//
-// Example:
-//
-//   res, err := couchbase.View("myddoc", "myview", map[string]interface{}{
-//       "group_level": 2,
-//       "start_key":    []interface{}{"thing"},
-//       "end_key":      []interface{}{"thing", map[string]string{}},
-//       "stale": false,
-//       })
-func (b *Bucket) View(ddoc, name string, params map[string]interface{}) (ViewResult, error) {
-	vres := ViewResult{}
-	return vres, b.ViewCustom(ddoc, name, params, &vres)
-}
-
 // Install a design document.
 func (b *Bucket) PutDDoc(docname string, value interface{}) error {
 	u, err := b.randomBaseURL()

diff --git a/views.go b/views.go
@@ -0,0 +1,132 @@
+package couchbase
+
+import (
+	"encoding/json"
+	"fmt"
+	"math/rand"
+	"net/url"
+)
+
+type ViewRow struct {
+	ID    string
+	Key   interface{}
+	Value interface{}
+	Doc   *interface{}
+}
+
+type ViewError struct {
+	From   string
+	Reason string
+}
+
+func (ve ViewError) Error() string {
+	return fmt.Sprintf("Node: %v, reason: %v", ve.From, ve.Reason)
+}
+
+type ViewResult struct {
+	TotalRows int `json:"total_rows"`
+	Rows      []ViewRow
+	Errors    []ViewError
+}
+
+func (b *Bucket) randomBaseURL() (*url.URL, error) {
+	node := b.Nodes[rand.Intn(len(b.Nodes))]
+	return url.Parse(node.CouchAPIBase)
+}
+
+// Document ID type for the startkey_docid parameter in views.
+type DocId string
+
+// Build a URL for a view with the given ddoc, view name, and
+// parameters.
+func (b *Bucket) ViewURL(ddoc, name string,
+	params map[string]interface{}) (string, error) {
+	u, err := b.randomBaseURL()
+	if err != nil {
+		return "", err
+	}
+
+	values := url.Values{}
+	for k, v := range params {
+		switch t := v.(type) {
+		case DocId:
+			values[k] = []string{string(t)}
+		case string:
+			values[k] = []string{fmt.Sprintf(`"%s"`, t)}
+		case int:
+			values[k] = []string{fmt.Sprintf(`%d`, t)}
+		case bool:
+			values[k] = []string{fmt.Sprintf(`%v`, t)}
+		default:
+			b, err := json.Marshal(v)
+			if err != nil {
+				panic(fmt.Sprintf("unsupported value-type %T in Query, json encoder said %v",
+					t, err))
+			}
+			values[k] = []string{fmt.Sprintf(`%v`, string(b))}
+		}
+	}
+
+	if ddoc == "" && name == "_all_docs" {
+		u.Path = fmt.Sprintf("/%s/_all_docs", b.Name)
+	} else {
+		u.Path = fmt.Sprintf("/%s/_design/%s/_view/%s", b.Name, ddoc, name)
+	}
+	u.RawQuery = values.Encode()
+
+	return u.String(), nil
+}
+
+// Perform a view request that can map row values to a custom type.
+//
+// See the source to View for an example usage.
+func (b *Bucket) ViewCustom(ddoc, name string, params map[string]interface{},
+	vres interface{}) error {
+
+	u, err := b.ViewURL(ddoc, name, params)
+	if err != nil {
+		return err
+	}
+
+	res, err := HttpClient.Get(u)
+	if err != nil {
+		return fmt.Errorf("Error starting view req at %v: %v", u, err)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != 200 {
+		bod := make([]byte, 512)
+		l, _ := res.Body.Read(bod)
+		return fmt.Errorf("Error executing view req at %v: %v - %s",
+			u, res.Status, bod[:l])
+	}
+
+	d := json.NewDecoder(res.Body)
+	if err := d.Decode(vres); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Execute a view.
+//
+// The ddoc parameter is just the bare name of your design doc without
+// the "_design/" prefix.
+//
+// Parameters are string keys with values that correspond to couchbase
+// view parameters.  Primitive should work fairly naturally (booleans,
+// ints, strings, etc...) and other values will attempt to be JSON
+// marshaled (useful for array indexing on on view keys, for example).
+//
+// Example:
+//
+//   res, err := couchbase.View("myddoc", "myview", map[string]interface{}{
+//       "group_level": 2,
+//       "start_key":    []interface{}{"thing"},
+//       "end_key":      []interface{}{"thing", map[string]string{}},
+//       "stale": false,
+//       })
+func (b *Bucket) View(ddoc, name string, params map[string]interface{}) (ViewResult, error) {
+	vres := ViewResult{}
+	return vres, b.ViewCustom(ddoc, name, params, &vres)
+}