Merge branch 'hotfix/v1.1.1'

Author: dancannon

Diff for: CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v1.1.1
+### Fixed
+ - Corrected protobuf import
+ - Fixed documentation
+ - Fixed issues with time pseudotype conversion that caused issues with milliseconds
+
 ## v1.1.0
 ### Added
  - Replaced `UseOutdated` with `ReadMode`

Diff for: README.md

@@ -1,7 +1,5 @@
 # GoRethink - RethinkDB Driver for Go 
 
-**Driver does not currently support RethinkDB 2.1, update coming soon!**
-
 [![GitHub tag](https://img.shields.io/github/tag/dancannon/gorethink.svg?style=flat)](https://github.com/dancannon/gorethink/releases)
 [![GoDoc](https://godoc.org/github.com/dancannon/gorethink?status.png)](https://godoc.org/github.com/dancannon/gorethink)
 [![build status](https://img.shields.io/travis/dancannon/gorethink/master.svg "build status")](https://travis-ci.org/dancannon/gorethink) 
@@ -10,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.1.0 (RethinkDB v2.1)
+Current version: v1.1.1 (RethinkDB v2.1)
 
 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).
 
@@ -188,7 +186,7 @@ if err != nil {
 }
 ```
 
-## Encoding/Decoding Structs
+## Encoding/Decoding
 When passing structs to Expr(And functions that use Expr such as Insert, Update) the structs are encoded into a map before being sent to the server. Each exported field is added to the map unless
 
   - the field's tag is "-", or
@@ -215,6 +213,8 @@ Field int `gorethink:",omitempty"`
 
 **NOTE:** It is strongly recommended that struct tags are used to explicitly define the mapping between your Go type and how the data is stored by RethinkDB. This is especially important when using an `Id` field as by default RethinkDB will create a field named `id` as the primary key (note that the RethinkDB field is lowercase but the Go version starts with a capital letter).
 
+When encoding maps with non-string keys the key values are automatically converted to strings where possible, however it is recommended that you use strings where possible (for example `map[string]T`).
+
 ## Benchmarks
 
 Everyone wants their project's benchmarks to be speedy. And while we know that rethinkDb and the gorethink driver are quite fast, our primary goal is for our benchmarks to be correct. They are designed to give you, the user, an accurate picture of writes per second (w/s). If you come up with a accurate test that meets this aim, submit a pull request please. 

Diff for: doc.go

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

Diff for: pseudotypes.go

@@ -125,8 +125,9 @@ func recursivelyConvertPseudotype(obj interface{}, opts map[string]interface{})
 
 func reqlTimeToNativeTime(timestamp float64, timezone string) (time.Time, error) {
 	sec, ms := math.Modf(timestamp)
-
-	t := time.Unix(int64(sec), int64(ms*1000*1000*1000))
+	
+	// Convert to native time rounding to milliseconds
+	t := time.Unix(int64(sec), int64(math.Floor(ms*1000+0.5))*1000*1000)
 
 	// Caclulate the timezone
 	if timezone != "" {

Diff for: ql2/ql2.pb.go

@@ -18,12 +18,12 @@ func (s *RethinkSuite) TestTimeTime(c *test.C) {
 
 func (s *RethinkSuite) TestTimeTimeMillisecond(c *test.C) {
 	var response time.Time
-	res, err := Time(1986, 11, 3, 12, 30, 15.679, "Z").Run(session)
+	res, err := Time(1986, 11, 3, 12, 30, 15.6790123, "Z").Run(session)
 	c.Assert(err, test.IsNil)
 
 	err = res.One(&response)
 	c.Assert(err, test.IsNil)
-	c.Assert(response.Equal(time.Date(1986, 11, 3, 12, 30, 15, 679.00002*1000*1000, time.UTC)), test.Equals, true)
+	c.Assert(response.Equal(time.Date(1986, 11, 3, 12, 30, 15, 679*1000*1000, time.UTC)), test.Equals, true)
 }
 
 func (s *RethinkSuite) TestTimeEpochTime(c *test.C) {