Merge branch 'master' into anon_time

Author: ereyes01

.travis.yml

@@ -6,6 +6,8 @@ go:
 
 cache: apt
 
+go_import_path: gopkg.in/dancannon/gorethink.v2
+
 before_script:
   - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
   - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -

CHANGELOG.md

@@ -2,6 +2,36 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v2.0.0 - 2016-04-13
+
+### Changed
+
+ - GoRethink now uses the v1.0 RethinkDB protocol which supports RethinkDB v2.3 and above. If you are using RethinkDB 2.2 or older please set `HandshakeVersion` when creating a session. For example:
+```go
+r.Connect(
+    ...
+    HandshakeVersion: r.HandshakeV0_4,
+    ...
+)
+```
+
+### Added
+ - Added support for username/password authentication. To login pass your username and password when creating a session using the `Username` and `Password` fields in the `ConnectOpts`.
+ - Added the `Grant` term
+ - Added the `Ordered` optional argument to `EqJoin`
+ - Added the `Fold` term and examples
+ - Added the `ReadOne` and `ReadAll` helper functions for quickly executing a query and scanning the result into a variable. For examples see the godocs.
+ - Added the `Peek` and `Skip` functions to the `Cursor`.
+ - Added support for referential arrays in structs
+ - Added the `Durability` argument to `RunOpts`/`ExecOpts`
+
+### Deprecated
+ - Deprecated the root `Wait` term, `r.Table(...).Wait()` should now be used instead.
+ - Deprecated session authentication using `AuthKey` 
+
+### Fixed
+ - Fixed issue with `ReconfigureOpts` field `PrimaryTag`
+
 ## v1.4.1 - 2016-04-02
 
 ### Fixed

README.md

@@ -8,7 +8,7 @@
 
 ![GoRethink Logo](https://raw.github.com/wiki/dancannon/gorethink/gopher-and-thinker-s.png "Golang Gopher and RethinkDB Thinker")
 
-Current version: v1.4.1 (RethinkDB v2.2)
+Current version: v2.0.0 (RethinkDB v2.3)
 
 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).
 
@@ -22,7 +22,7 @@ go get -u github.com/dancannon/gorethink
 
 Or (pinned to the v1.x.x tag)
 ```
-go get gopkg.in/dancannon/gorethink.v1
+go get gopkg.in/dancannon/gorethink.v2
 ```
 
 ## Connection

checkers_test.go

@@ -6,7 +6,7 @@ import (
 
 	test "gopkg.in/check.v1"
 
-	"gopkg.in/dancannon/gorethink.v1/types"
+	"gopkg.in/dancannon/gorethink.v2/types"
 )
 
 type jsonChecker struct {

connection.go

@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	p "gopkg.in/dancannon/gorethink.v1/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 const (
@@ -63,16 +63,14 @@ func NewConnection(address string, opts *ConnectOpts) (*Connection, error) {
 		return nil, RQLConnectionError{rqlError(err.Error())}
 	}
 
-	// Send handshake request
-	if err = c.writeHandshakeReq(); err != nil {
-		c.Close()
-		return nil, RQLConnectionError{rqlError(err.Error())}
-	}
-	// Read handshake response
-	err = c.readHandshakeSuccess()
+	// Send handshake
+	handshake, err := c.handshake(opts.HandshakeVersion)
 	if err != nil {
-		c.Close()
-		return nil, RQLConnectionError{rqlError(err.Error())}
+		return nil, err
+	}
+
+	if err = handshake.Send(); err != nil {
+		return nil, err
 	}
 
 	return c, nil