Merge branch 'release/v1.0.0'

Author: dancannon

CHANGELOG.md

@@ -2,18 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## v1.0.0 RC3 - 2015-06-22
+## v1.0.0 - 2015-06-27
 
-### Changed
- - Reverted change that added sorting to maps when decoding due to performance concerts, instead documented that struct tags should be used. Especially when using a field named `Id`.
+1.0.0 is finally here, This is the first stable production ready release of GoRethink!
 
-## v1.0.0 RC2 - 2015-06-11
+![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker.png "Golang Gopher and RethinkDB Thinker")
 
-### Fixed
- - Fixed issue causing driver to fail when connecting to DB which did not have its canonical address set correctly (#200).
-
-## v1.0.0 RC1 - 2015-06-07
-In an attempt to make this library more "idiomatic" some functions have been renamed, for the full list of changes see below.
+In an attempt to make this library more "idiomatic" some functions have been renamed, for the full list of changes and bug fixes see below.
 
 ### Added
  - Added more documentation.
@@ -38,9 +33,10 @@ In an attempt to make this library more "idiomatic" some functions have been ren
  - Removed depth limit when encoding values using `Expr`
 
 ### Fixed
- - Fixed issue causing inconsistent results when unmarshaling query response into structs (#192)
  - Fixed issue causing errors when closing a changefeed cursor (#191)
  - Fixed issue causing nodes to remain unhealthy when host discovery is disabled (#195)
+ - Fixed issue causing driver to fail when connecting to DB which did not have its canonical address set correctly (#200).
+- Fixed ongoing queries not being properly stopped when closing the cursor.
 
 ### Removed
  - Removed `CacheSize` and `DataCenter` optional arguments in `TableCreateOpts`.

README.md

@@ -6,8 +6,9 @@
 
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
 
+![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
 
-Current version: v1.0.0 RC3 (RethinkDB v2.0) 
+Current version: v1.0.0 (RethinkDB v2.0)
 
 Please note that this version of the driver only supports versions of RethinkDB using the v0.4 protocol (any versions of the driver older than RethinkDB 2.0 will not work).
 
@@ -19,6 +20,11 @@ Please note that this version of the driver only supports versions of RethinkDB
 go get -u github.com/dancannon/gorethink
 ```
 
+Or (pinned to the v1.x.x tag)
+```
+go get gopkg.in/dancannon/gorethink.v1
+```
+
 ## Connection
 
 ### Basic Connection

cursor.go

@@ -98,7 +98,7 @@ func (c *Cursor) Close() error {
 	}
 
 	// Stop any unfinished queries
-	if c.closed == 0 && !c.finished {
+	if !c.finished {
 		q := Query{
 			Type:  p.Query_STOP,
 			Token: c.token,

doc.go

@@ -1,6 +1,6 @@
 // Package gorethink implements a Go driver for RethinkDB
 //
-// Current version: v1.0.0-rc.3 (RethinkDB v2.0)
+// Current version: v1.0.0 (RethinkDB v2.0)
 // For more in depth information on how to use RethinkDB check out the API docs
 // at http://rethinkdb.com/api
 package gorethink

query_table_test.go

@@ -2,6 +2,7 @@ package gorethink
 
 import (
 	"sync"
+	"time"
 
 	test "gopkg.in/check.v1"
 )
@@ -213,3 +214,42 @@ func (s *RethinkSuite) TestTableChanges(c *test.C) {
 
 	c.Assert(n, test.Equals, 10)
 }
+
+func (s *RethinkSuite) TestTableChangesExit(c *test.C) {
+	DB("test").TableDrop("changes").Exec(session)
+	DB("test").TableCreate("changes").Exec(session)
+
+	var n int
+
+	res, err := DB("test").Table("changes").Changes().Run(session)
+	if err != nil {
+		c.Fatal(err.Error())
+	}
+	c.Assert(res.Type(), test.Equals, "Feed")
+
+	change := make(chan ChangeResponse)
+
+	// Close cursor after one second
+	go func() {
+		<-time.After(time.Second)
+		res.Close()
+	}()
+
+	// Insert 5 docs
+	DB("test").Table("changes").Insert(map[string]interface{}{"n": 1}).Exec(session)
+	DB("test").Table("changes").Insert(map[string]interface{}{"n": 2}).Exec(session)
+	DB("test").Table("changes").Insert(map[string]interface{}{"n": 3}).Exec(session)
+	DB("test").Table("changes").Insert(map[string]interface{}{"n": 4}).Exec(session)
+	DB("test").Table("changes").Insert(map[string]interface{}{"n": 5}).Exec(session)
+
+	// Listen for changes
+	res.Listen(change)
+	for _ = range change {
+		n++
+	}
+	if res.Err() != nil {
+		c.Fatal(res.Err())
+	}
+
+	c.Assert(n, test.Equals, 5)
+}