Merge tag 'v1.0.0-rc.1' into develop

Released v1.0.0-rc.1

Author: dancannon

CHANGELOG.md

@@ -2,19 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
-
+## v1.0.0-RC.1 - 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.
 
 ### Added
  - Added more documentation.
  - Added `Shards`, `Replicas` and `PrimaryReplicaTag` optional arguments in `TableCreateOpts`.
  - Added `MultiGroup` and `MultiGroupByIndex` which are equivalent to the running `group` with the `multi` optional argument set to true.
 
-### Fixed 
- - Fixed issue causing inconsistent results when unmarshaling query response into structs (#192)
- - Fixed issue causing errors when closing a changefeed cursor (#191)
-
 ### Changed 
  - Renamed `Db` to `DB`.
  - Renamed `DbCreate` to `DBCreate`.
@@ -32,11 +27,12 @@ In an attempt to make this library more "idiomatic" some functions have been ren
  - Renamed `WriteChanges` to `ChangeResponse`, this is now a general type and can be used when dealing with changefeeds.
  - Removed depth limit when encoding values using `Expr`
 
-## Fixed
+### 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)
 
 ### Removed
-
  - Removed `CacheSize` and `DataCenter` optional arguments in `TableCreateOpts`.
  - Removed `CacheSize` optional argument from `InsertOpts`
 

README.md

@@ -7,7 +7,7 @@
 [Go](http://golang.org/) driver for [RethinkDB](http://www.rethinkdb.com/) 
 
 
-Current version: v0.7.2 (RethinkDB v2.0) 
+Current version: v1.0.0-RC.1 (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).
 

cursor.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"reflect"
+	"sync/atomic"
 
 	"github.com/dancannon/gorethink/encoding"
 	p "github.com/dancannon/gorethink/ql2"

doc.go

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

example_query_control_test.go

@@ -62,7 +62,7 @@ func ExampleTerm_Default() {
 }
 
 // Convert a Go integer to a ReQL object
-func ExampleExpr_Int() {
+func ExampleExpr_int() {
 	cur, err := Expr(1).Run(session)
 	if err != nil {
 		fmt.Print(err)
@@ -82,7 +82,7 @@ func ExampleExpr_Int() {
 }
 
 // Convert a Go slice to a ReQL object
-func ExampleExpr_Slice() {
+func ExampleExpr_slice() {
 	cur, err := Expr([]int{1, 2, 3}).Run(session)
 	if err != nil {
 		fmt.Print(err)
@@ -107,7 +107,7 @@ func ExampleExpr_Slice() {
 }
 
 // Convert a Go slice to a ReQL object
-func ExampleExpr_Map() {
+func ExampleExpr_map() {
 	cur, err := Expr(map[string]interface{}{
 		"a": 1,
 		"b": "b",
@@ -134,7 +134,7 @@ func ExampleExpr_Map() {
 }
 
 // Convert a Go slice to a ReQL object
-func ExampleExpr_Struct() {
+func ExampleExpr_struct() {
 	type ExampleTypeNested struct {
 		N int
 	}
@@ -188,7 +188,7 @@ func ExampleExpr_Struct() {
 
 // Convert a Go struct (with gorethink tags) to a ReQL object. The tags allow
 // the field names to be changed.
-func ExampleExpr_StructTags() {
+func ExampleExpr_structTags() {
 	type ExampleType struct {
 		A int    `gorethink:"field_a"`
 		B string `gorethink:"field_b"`

example_query_manipulation_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 // Get john's age
-func ExampleField() {
+func ExampleTerm_Field() {
 	cur, err := DB("examples").Table("users").Get("john").Field("age").Run(session)
 	if err != nil {
 		fmt.Print(err)

example_query_select_test.go

@@ -31,7 +31,7 @@ func ExampleTerm_Get() {
 }
 
 // Find a document and merge another document with it.
-func ExampleTerm_Get_Merge() {
+func ExampleTerm_Get_merge() {
 	// Fetch the row from the database
 	res, err := DB("examples").Table("heroes").Get(4).Merge(map[string]interface{}{
 		"powers": []string{"speed"},
@@ -83,7 +83,7 @@ func ExampleTerm_Filter() {
 }
 
 // Get all users who are more than 25 years old.
-func ExampleTerm_Filter_Row() {
+func ExampleTerm_Filter_row() {
 	// Fetch the row from the database
 	res, err := DB("examples").Table("users").Filter(Row.Field("age").Gt(25)).Run(session)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleTerm_Filter_Row() {
 }
 
 // Retrieve all users who have a gmail account (whose field email ends with @gmail.com).
-func ExampleTerm_Filter_Function() {
+func ExampleTerm_Filter_function() {
 	// Fetch the row from the database
 	res, err := DB("examples").Table("users").Filter(func(user Term) Term {
 		return user.Field("email").Match("@gmail.com$")

example_query_transformation_test.go

@@ -28,7 +28,7 @@ func ExampleTerm_Map() {
 }
 
 // Sum the elements of three sequences.
-func ExampleMap_MultipleSequences() {
+func ExampleMap_multipleSequences() {
 	var sequence1 = []int{100, 200, 300, 400}
 	var sequence2 = []int{10, 20, 30, 40}
 	var sequence3 = []int{1, 2, 3, 4}
@@ -55,7 +55,7 @@ func ExampleMap_MultipleSequences() {
 }
 
 // Order all the posts using the index date.
-func ExampleTerm_OrderBy_Index() {
+func ExampleTerm_OrderBy_index() {
 	cur, err := DB("examples").Table("posts").OrderBy(OrderByOpts{
 		Index: "date",
 	}).Run(session)
@@ -75,7 +75,7 @@ func ExampleTerm_OrderBy_Index() {
 }
 
 // Order all the posts using the index date in descending order.
-func ExampleTerm_OrderBy_IndexDesc() {
+func ExampleTerm_OrderBy_indexDesc() {
 	cur, err := DB("examples").Table("posts").OrderBy(OrderByOpts{
 		Index: Desc("date"),
 	}).Run(session)
@@ -96,7 +96,7 @@ func ExampleTerm_OrderBy_IndexDesc() {
 
 // You can efficiently order using multiple fields by using a compound index.
 // For example order by date and title.
-func ExampleTerm_OrderBy_Compound() {
+func ExampleTerm_OrderBy_compound() {
 	cur, err := DB("examples").Table("posts").OrderBy(OrderByOpts{
 		Index: Desc("dateAndTitle"),
 	}).Run(session)
@@ -117,7 +117,7 @@ func ExampleTerm_OrderBy_Compound() {
 
 // If you have a sequence with fewer documents than the arrayLimit, you can order
 // it by multiple fields without an index.
-func ExampleTerm_OrderBy_Multiple() {
+func ExampleTerm_OrderBy_multiple() {
 	cur, err := DB("examples").Table("posts").OrderBy(
 		"title",
 		OrderByOpts{Index: Desc("date")},
@@ -140,7 +140,7 @@ func ExampleTerm_OrderBy_Multiple() {
 // Notice that an index ordering always has highest precedence. The following
 // query orders posts by date, and if multiple posts were published on the same
 // date, they will be ordered by title.
-func ExampleTerm_OrderBy_MultipleWithIndex() {
+func ExampleTerm_OrderBy_multipleWithIndex() {
 	cur, err := DB("examples").Table("posts").OrderBy(
 		"title",
 		OrderByOpts{Index: Desc("date")},

example_query_write_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 // Insert a document into the table posts using a struct.
-func ExampleTerm_Insert_Struct() {
+func ExampleTerm_Insert_struct() {
 	type Post struct {
 		ID      int    `gorethink:"id"`
 		Title   string `gorethink:"title"`
@@ -30,7 +30,7 @@ func ExampleTerm_Insert_Struct() {
 
 // Insert a document without a defined primary key into the table posts where
 // the primary key is id.
-func ExampleTerm_Insert_GeneratedKey() {
+func ExampleTerm_Insert_generatedKey() {
 	type Post struct {
 		Title   string `gorethink:"title"`
 		Content string `gorethink:"content"`
@@ -52,7 +52,7 @@ func ExampleTerm_Insert_GeneratedKey() {
 }
 
 // Insert a document into the table posts using a map.
-func ExampleTerm_Insert_Map() {
+func ExampleTerm_Insert_map() {
 	resp, err := DB("examples").Table("posts").Insert(map[string]interface{}{
 		"id":      2,
 		"title":   "Lorem ipsum",
@@ -70,7 +70,7 @@ func ExampleTerm_Insert_Map() {
 }
 
 // Insert multiple documents into the table posts.
-func ExampleTerm_Insert_Multiple() {
+func ExampleTerm_Insert_multiple() {
 	resp, err := DB("examples").Table("posts").Insert([]interface{}{
 		map[string]interface{}{
 			"title":   "Lorem ipsum",
@@ -94,7 +94,7 @@ func ExampleTerm_Insert_Multiple() {
 
 // Insert a document into the table posts, replacing the document if it already
 // exists.
-func ExampleTerm_Insert_Upsert() {
+func ExampleTerm_Insert_upsert() {
 	resp, err := DB("examples").Table("posts").Insert(map[string]interface{}{
 		"id":    1,
 		"title": "Lorem ipsum 2",
@@ -129,7 +129,7 @@ func ExampleTerm_Update() {
 }
 
 // Update bob's cell phone number.
-func ExampleTerm_Update_Nested() {
+func ExampleTerm_Update_nested() {
 	resp, err := DB("examples").Table("users").Get("bob").Update(map[string]interface{}{
 		"contact": map[string]interface{}{
 			"phone": "408-555-4242",
@@ -147,7 +147,7 @@ func ExampleTerm_Update_Nested() {
 }
 
 // Update the status of all posts to published.
-func ExampleTerm_Update_All() {
+func ExampleTerm_Update_all() {
 	resp, err := DB("examples").Table("posts").Update(map[string]interface{}{
 		"status": "published",
 	}).RunWrite(session)
@@ -164,7 +164,7 @@ func ExampleTerm_Update_All() {
 
 // Increment the field view of the post with id of 1. If the field views does not
 // exist, it will be set to 0.
-func ExampleTerm_Update_Increment() {
+func ExampleTerm_Update_increment() {
 	resp, err := DB("examples").Table("posts").Get(1).Update(map[string]interface{}{
 		"views": Row.Field("views").Add(1).Default(0),
 	}).RunWrite(session)
@@ -180,7 +180,7 @@ func ExampleTerm_Update_Increment() {
 }
 
 // Update the status of the post with id of 1 using soft durability.
-func ExampleTerm_Update_SoftDurability() {
+func ExampleTerm_Update_softDurability() {
 	resp, err := DB("examples").Table("posts").Get(2).Update(map[string]interface{}{
 		"status": "draft",
 	}, UpdateOpts{
@@ -212,7 +212,7 @@ func ExampleTerm_Delete() {
 }
 
 // Delete all comments where the field status is published
-func ExampleTerm_Delete_Many() {
+func ExampleTerm_Delete_many() {
 	resp, err := DB("examples").Table("posts").Filter(map[string]interface{}{
 		"status": "published",
 	}).Delete().RunWrite(session)

example_test.go

@@ -5,6 +5,13 @@ import (
 )
 
 func Example() {
+	session, err := Connect(ConnectOpts{
+		Address: url,
+	})
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
+
 	res, err := Expr("Hello World").Run(session)
 	if err != nil {
 		log.Fatalln(err.Error())
@@ -17,4 +24,7 @@ func Example() {
 	}
 
 	fmt.Println(response)
+
+	// Output:
+	// Hello World
 }