Changed connection arguments to use ConnectOpts instead of using

a map

Author: dancannon

example_query_select_test.go

@@ -15,8 +15,8 @@ func ExampleRqlTerm_Get() {
 		Gender    string `gorethink:"gender"`
 	}
 
-	sess, err := r.Connect(map[string]interface{}{
-		"address": url,
+	sess, err := r.Connect(r.ConnectOpts{
+		Address: url,
 	})
 
 	// Setup table
@@ -54,8 +54,8 @@ func ExampleRqlTerm_GetAll_compound() {
 		Gender    string `gorethink:"gender"`
 	}
 
-	sess, err := r.Connect(map[string]interface{}{
-		"address": url,
+	sess, err := r.Connect(r.ConnectOpts{
+		Address: url,
 	})
 
 	// Setup table

example_query_table_test.go

@@ -2,13 +2,14 @@ package gorethink_test
 
 import (
 	"fmt"
-	r "github.com/dancannon/gorethink"
 	"log"
+
+	r "github.com/dancannon/gorethink"
 )
 
 func ExampleRqlTerm_TableCreate() {
-	sess, err := r.Connect(map[string]interface{}{
-		"address": url,
+	sess, err := r.Connect(r.ConnectOpts{
+		Address: url,
 	})
 
 	// Setup database
@@ -26,8 +27,8 @@ func ExampleRqlTerm_TableCreate() {
 }
 
 func ExampleRqlTerm_IndexCreate() {
-	sess, err := r.Connect(map[string]interface{}{
-		"address": url,
+	sess, err := r.Connect(r.ConnectOpts{
+		Address: url,
 	})
 
 	// Setup database
@@ -46,8 +47,8 @@ func ExampleRqlTerm_IndexCreate() {
 }
 
 func ExampleRqlTerm_IndexCreate_compound() {
-	sess, err := r.Connect(map[string]interface{}{
-		"address": url,
+	sess, err := r.Connect(r.ConnectOpts{
+		Address: url,
 	})
 
 	// Setup database

example_test.go

@@ -2,9 +2,10 @@ package gorethink_test
 
 import (
 	"fmt"
-	r "github.com/dancannon/gorethink"
 	"log"
 	"os"
+
+	r "github.com/dancannon/gorethink"
 )
 
 var session *r.Session
@@ -19,8 +20,8 @@ func init() {
 }
 
 func Example() {
-	session, err := r.Connect(map[string]interface{}{
-		"address": url,
+	session, err := r.Connect(r.ConnectOpts{
+		Address: url,
 	})
 	if err != nil {
 		log.Fatalln(err.Error())

gorethink_test.go

@@ -3,10 +3,11 @@ package gorethink
 import (
 	"encoding/json"
 	"flag"
-	test "launchpad.net/gocheck"
 	"os"
 	"testing"
 	"time"
+
+	test "launchpad.net/gocheck"
 )
 
 var sess *Session
@@ -37,10 +38,10 @@ var _ = test.Suite(&RethinkSuite{})
 
 func (s *RethinkSuite) SetUpSuite(c *test.C) {
 	var err error
-	sess, err = Connect(map[string]interface{}{
-		"address":   url,
-		"maxIdle":   3,
-		"maxActive": 3,
+	sess, err = Connect(ConnectOpts{
+		Address:   url,
+		MaxIdle:   3,
+		MaxActive: 3,
 	})
 	c.Assert(err, test.IsNil)
 }

session.go

@@ -1,10 +1,11 @@
 package gorethink
 
 import (
-	"code.google.com/p/goprotobuf/proto"
-	p "github.com/dancannon/gorethink/ql2"
 	"sync/atomic"
 	"time"
+
+	"code.google.com/p/goprotobuf/proto"
+	p "github.com/dancannon/gorethink/ql2"
 )
 
 type Session struct {
@@ -64,6 +65,21 @@ func newSession(args map[string]interface{}) *Session {
 	return s
 }
 
+type ConnectOpts struct {
+	Token       int64         `gorethink:"token,omitempty"`
+	Address     string        `gorethink:"address,omitempty"`
+	Database    string        `gorethink:"database,omitempty"`
+	Timeout     time.Duration `gorethink:"timeout,omitempty"`
+	AuthKey     string        `gorethink:"authkey,omitempty"`
+	MaxIdle     int           `gorethink:"max_idle,omitempty"`
+	MaxActive   int           `gorethink:"max_active,omitempty"`
+	IdleTimeout time.Duration `gorethink:"idle_timeout,omitempty"`
+}
+
+func (o *ConnectOpts) toMap() map[string]interface{} {
+	return optArgsToMap(o)
+}
+
 // Connect creates a new database session.
 //
 // Supported arguments include token, address, database, timeout, authkey,
@@ -76,13 +92,13 @@ func newSession(args map[string]interface{}) *Session {
 // Basic connection example:
 //
 //	var session *r.Session
-//	session, err := r.Connect(map[string]interface{}{
-//		"address":  "localhost:28015",
-//		"database": "test",
-//		"authkey":  "14daak1cad13dj",
+//	session, err := r.Connect(r.ConncetOpts{
+//		Address:  "localhost:28015",
+//		Database: "test",
+//		AuthKey:  "14daak1cad13dj",
 //	})
-func Connect(args map[string]interface{}) (*Session, error) {
-	s := newSession(args)
+func Connect(args ConnectOpts) (*Session, error) {
+	s := newSession(args.toMap())
 	err := s.Reconnect()
 
 	return s, err

session_test.go

@@ -6,10 +6,10 @@ import (
 
 func (s *RethinkSuite) TestSessionConnectError(c *test.C) {
 	var err error
-	_, err = Connect(map[string]interface{}{
-		"address":   "nonexistanturl",
-		"maxIdle":   3,
-		"maxActive": 3,
+	_, err = Connect(ConnectOpts{
+		Address:   "nonexistanturl",
+		MaxIdle:   3,
+		MaxActive: 3,
 	})
 	c.Assert(err, test.NotNil)
 }