Merge branch 'release/v0.7.2'

Author: dancannon

CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v0.7.2 - 2015-05-05
+### Added
+ - Added support for connecting to a server using TLS (#179)
+
+### Fixed
+ - Fixed issue causing driver to fail to connect to servers with the HTTP admin interface disabled (#181)
+ - Fixed errors in documentation (#182, #184)
+ - Fixed RunWrite not closing the cursor (#185)
+
 ## v0.7.1 - 2015-04-19
 ### Changed
 - Improved logging of connection errors.

README.md

@@ -7,7 +7,7 @@
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
 
 
-Current version: v0.7.1 (RethinkDB v2.0) 
+Current version: v0.7.2 (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).
 
@@ -76,7 +76,7 @@ session, err := r.Connect(r.ConnectOpts{
     Database: "test",
     AuthKey:  "14daak1cad13dj",
     DiscoverHosts: true,
-}, "localhost:28015")
+})
 if err != nil {
     log.Fatalln(err.Error())
 }
@@ -140,6 +140,7 @@ res, err := r.Db("database").Table("tablename").Get(key).Run(session)
 if err != nil {
     // error
 }
+defer res.Close() // Always ensure you close the cursor to ensure connections are not leaked
 ```
 
 Cursors have a number of methods available for accessing the query results

connection.go

@@ -1,6 +1,7 @@
 package gorethink
 
 import (
+	"crypto/tls"
 	"encoding/binary"
 	"encoding/json"
 	"io"
@@ -49,7 +50,11 @@ func NewConnection(address string, opts *ConnectOpts) (*Connection, error) {
 	}
 	// Connect to Server
 	nd := net.Dialer{Timeout: c.opts.Timeout}
-	c.conn, err = nd.Dial("tcp", address)
+	if c.opts.TLSConfig == nil {
+		c.conn, err = nd.Dial("tcp", address)
+	} else {
+		c.conn, err = tls.DialWithDialer(&nd, "tcp", address, c.opts.TLSConfig)
+	}
 	if err != nil {
 		return nil, err
 	}

doc.go

@@ -1,6 +1,6 @@
 // Package gorethink implements a Go driver for RethinkDB
 //
-// Current version: v0.7.1 (RethinkDB v2.0)
+// Current version: v0.7.2 (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

node.go

@@ -191,7 +191,6 @@ type nodeStatus struct {
 	Status  string `gorethink:"status"`
 	Network struct {
 		Hostname           string `gorethink:"hostname"`
-		HTTPAdminPort      int64  `gorethink:"http_admin_port"`
 		ClusterPort        int64  `gorethink:"cluster_port"`
 		ReqlPort           int64  `gorethink:"reql_port"`
 		CanonicalAddresses []struct {

query.go

@@ -202,11 +202,21 @@ func (t Term) Run(s *Session, optArgs ...RunOpts) (*Cursor, error) {
 //	res, err := r.Db("database").Table("table").Insert(doc).RunWrite(sess)
 func (t Term) RunWrite(s *Session, optArgs ...RunOpts) (WriteResponse, error) {
 	var response WriteResponse
+
 	res, err := t.Run(s, optArgs...)
-	if err == nil {
-		err = res.One(&response)
+	if err != nil {
+		return response, err
+	}
+
+	if err = res.One(&response); err != nil {
+		return response, err
 	}
-	return response, err
+
+	if err = res.Close(); err != nil {
+		return response, err
+	}
+
+	return response, nil
 }
 
 // ExecOpts inherits its options from RunOpts, the only difference is the
@@ -240,7 +250,7 @@ func (o *ExecOpts) toMap() map[string]interface{} {
 // Exec runs the query but does not return the result. Exec will still wait for
 // the response to be received unless the NoReply field is true.
 //
-//	res, err := r.Db("database").Table("table").Insert(doc).Exec(sess, r.ExecOpts{
+//	err := r.Db("database").Table("table").Insert(doc).Exec(sess, r.ExecOpts{
 //		NoReply: true,
 //	})
 func (t Term) Exec(s *Session, optArgs ...ExecOpts) error {

session.go

@@ -1,6 +1,7 @@
 package gorethink
 
 import (
+	"crypto/tls"
 	"time"
 
 	p "github.com/dancannon/gorethink/ql2"
@@ -22,6 +23,7 @@ type ConnectOpts struct {
 	Database  string        `gorethink:"database,omitempty"`
 	AuthKey   string        `gorethink:"authkey,omitempty"`
 	Timeout   time.Duration `gorethink:"timeout,omitempty"`
+	TLSConfig *tls.Config   `gorethink:"tlsconfig,omitempty"`
 
 	MaxIdle int `gorethink:"max_idle,omitempty"`
 	MaxOpen int `gorethink:"max_open,omitempty"`