Merge pull request #113 from robert-zaremba/master

dancannon · dancannon · commit 7121b0855c03 · 2014-08-12T15:38:59.000+01:00
Documentation update, use correct import fo go-check and resolve IsNil issue in One
diff --git a/gorethink_test.go b/gorethink_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 var sess *Session
diff --git a/query_aggregation_test.go b/query_aggregation_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestAggregationReduce(c *test.C) {
diff --git a/query_control_test.go b/query_control_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestControlExecNil(c *test.C) {
@@ -15,7 +15,7 @@ func (s *RethinkSuite) TestControlExecNil(c *test.C) {
 
 	err = res.One(&response)
 
-	c.Assert(err, test.IsNil)
+	c.Assert(err, test.Equals, ErrEmptyResult)
 	c.Assert(response, test.Equals, nil)
 }
 
diff --git a/query_db_test.go b/query_db_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestDbCreate(c *test.C) {
diff --git a/query_join_test.go b/query_join_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestJoinInnerJoin(c *test.C) {
diff --git a/query_manipulation_test.go b/query_manipulation_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestManipulationDocField(c *test.C) {
diff --git a/query_math_test.go b/query_math_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestMathAdd(c *test.C) {
diff --git a/query_select_test.go b/query_select_test.go
@@ -3,7 +3,7 @@ package gorethink
 import (
 	"fmt"
 
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestSelectGet(c *test.C) {
diff --git a/query_string_test.go b/query_string_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestStringMatchSuccess(c *test.C) {
diff --git a/query_table_test.go b/query_table_test.go
@@ -3,7 +3,7 @@ package gorethink
 import (
 	"sync"
 
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestTableCreate(c *test.C) {
diff --git a/query_test.go b/query_test.go
@@ -1,6 +1,6 @@
 package gorethink
 
-import test "launchpad.net/gocheck"
+import test "gopkg.in/check.v1"
 
 func (s *RethinkSuite) TestQueryRun(c *test.C) {
 	var response string
diff --git a/query_time_test.go b/query_time_test.go
@@ -3,7 +3,7 @@ package gorethink
 import (
 	"time"
 
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestTimeTime(c *test.C) {
diff --git a/query_transformation.go b/query_transformation.go
@@ -34,7 +34,7 @@ func (o *OrderByOpts) toMap() map[string]interface{} {
 // Sort the sequence by document values of the given key(s).
 // To specify the index to use for ordering us a last argument in the following form:
 //
-//	map[string]interface{}{"index": "index-name"}
+//	OrderByOpts{Index: "index-name"}
 //
 // OrderBy defaults to ascending ordering. To explicitly specify the ordering,
 // wrap the attribute with either Asc or Desc.
diff --git a/query_transformation_test.go b/query_transformation_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestTransformationMapImplicit(c *test.C) {
diff --git a/query_write_test.go b/query_write_test.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestWriteInsert(c *test.C) {
diff --git a/results.go b/results.go
@@ -196,9 +196,12 @@ func (c *Cursor) All(result interface{}) error {
 	return c.Close()
 }
 
-// All retrieves a single document from the result set into the provided
+// One retrieves a single document from the result set into the provided
 // slice and closes the cursor.
 func (c *Cursor) One(result interface{}) error {
+	if c.IsNil() {
+		return ErrEmptyResult
+	}
 	ok := c.Next(result)
 	if !ok {
 		err := c.Err()
diff --git a/results_test.go b/results_test.go
@@ -1,6 +1,6 @@
 package gorethink
 
-import test "launchpad.net/gocheck"
+import test "gopkg.in/check.v1"
 
 type object struct {
 	Id    int64  `gorethink:"id,omitempty"`
@@ -163,7 +163,8 @@ func (s *RethinkSuite) TestEmptyResults(c *test.C) {
 	res, err = Db("test").Table("test").Get("missing value").Run(sess)
 	c.Assert(err, test.IsNil)
 	var response interface{}
-	res.One(&response)
+	err = res.One(&response)
+	c.Assert(err, test.Equals, ErrEmptyResult)
 	c.Assert(res.IsNil(), test.Equals, true)
 
 	res, err = Db("test").Table("test").Get("missing value").Run(sess)
diff --git a/session_test.go b/session_test.go
@@ -3,7 +3,7 @@ package gorethink
 import (
 	"os"
 
-	test "launchpad.net/gocheck"
+	test "gopkg.in/check.v1"
 )
 
 func (s *RethinkSuite) TestSessionConnect(c *test.C) {
diff --git a/wercker.yml b/wercker.yml
@@ -16,7 +16,7 @@ build:
           code: |
             cd $WERCKER_SOURCE_DIR
             go version
-            go get ./... && go get -u launchpad.net/gocheck && go test -i
+            go get ./... && go get -u gopkg.in/check.v1 && go test -i
 
       # Build the project
       - script:

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`	`"time"`
`9`	`9`
`10`		`- test "launchpad.net/gocheck"`
	`10`	`+ test "gopkg.in/check.v1"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var sess *Session`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package gorethink`
`2`	`2`
`3`	`3`	`import (`
`4`		`- test "launchpad.net/gocheck"`
	`4`	`+ test "gopkg.in/check.v1"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`func (s RethinkSuite) TestAggregationReduce(c test.C) {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- test "launchpad.net/gocheck"`
	`7`	`+ test "gopkg.in/check.v1"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func (s RethinkSuite) TestControlExecNil(c test.C) {`
`@@ -15,7 +15,7 @@ func (s RethinkSuite) TestControlExecNil(c test.C) {`
`15`	`15`
`16`	`16`	`err = res.One(&response)`
`17`	`17`
`18`		`- c.Assert(err, test.IsNil)`
	`18`	`+ c.Assert(err, test.Equals, ErrEmptyResult)`
`19`	`19`	`c.Assert(response, test.Equals, nil)`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package gorethink`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- test "launchpad.net/gocheck"`
	`6`	`+ test "gopkg.in/check.v1"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func (s RethinkSuite) TestSelectGet(c test.C) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package gorethink`
`3`	`3`	`import (`
`4`	`4`	`"sync"`
`5`	`5`
`6`		`- test "launchpad.net/gocheck"`
	`6`	`+ test "gopkg.in/check.v1"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func (s RethinkSuite) TestTableCreate(c test.C) {`