rethinkdb 2.1.0.2 → 2.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb7d223e47d54934c1ac7cacc2428c5fbcc703a
-  data.tar.gz: 59d38d87a0ad38746109a006ca1116e473ee1bf3
+  metadata.gz: 60798aad43b5c77c2292e67e6e4fe8ebe9fbf867
+  data.tar.gz: fafdffd9312c75094c91e0406cba41d07d0d1236
 SHA512:
-  metadata.gz: 614c86b32a5735c20405a5f3003ba5725f01140442da10c56db22c4cb4cfa4a9bf8e8c73d17decc4398776aa8a3c08a66d30b63b1a82da324d6b5065bc362630
-  data.tar.gz: cbc0b2f65cd489e52b85a573eaf5b8d4bc5fe86b5e203cb8ef1d9f407be07cea73f8416899bdb453cae17ca39cb434bdadabe206c5eccc228f1bd75dd18b59cb
+  metadata.gz: a5ad8f76496580b2846cf705a2892dfc0b66478640993c987eb44837e06de2cda5c8aad237c0312b6619b76333cf504def55affa08d133bb6dceefadff405daf
+  data.tar.gz: 342b60a7d467a1d698c104c2c73594311cd46cc553820dd85efc81f38f93ddd504ad9d20d58a255d431737c5a3020edf5275c16bfd1379face343d8d30a33a81

data/lib/exc.rb

@@ -14,4 +14,6 @@ module RethinkDB
   ReqlDriverError = RqlDriverError = Class.new(ReqlError)
   ReqlAuthError = RqlAuthError = Class.new(ReqlDriverError)
   ReqlCompileError = RqlCompileError = Class.new(ReqlError)
+  ReqlServerCompileError = Class.new(ReqlCompileError)
+  ReqlDriverCompileError = Class.new(ReqlCompileError)
 end

data/lib/func.rb

@@ -88,7 +88,7 @@ module RethinkDB
                 "This is almost always a precedence error.\n" +
                 "Note that `a < b | b < c` <==> `a < (b | b) < c`.\n" +
                 "If you really want this behavior, use `.or` or `.and` instead."
-              raise ReqlDriverError, err
+              raise ReqlDriverCompileError, err
             end
           }
         end
@@ -151,7 +151,7 @@ module RethinkDB
     def do(*args, &b)
       a = ((@body != RQL) ? [self] : []) + args.dup
       if a == [] && !b
-        raise ReqlDriverError, "Expected 1 or more arguments but found 0."
+        raise ReqlDriverCompileError, "Expected 1 or more arguments but found 0."
       end
       funcall_args = (b ? [new_func(&b)] : [a.pop]) + a
       # PP.pp funcall_args

data/lib/net.rb

@@ -755,6 +755,16 @@ module RethinkDB
       nil
     end
 
+    def server
+      raise ReqlRuntimeError, "Connection is closed." if !is_open()
+      q = [Query::QueryType::SERVER_INFO]
+      res = run_internal(q, {noreply: false}, new_token)
+      if res['t'] != Response::ResponseType::SERVER_INFO
+        raise ReqlRuntimeError, "Unexpected response to server_info: " + PP.pp(res, "")
+      end
+      res['r'][0]
+    end
+
     def self.last
       return @@last if @@last
       raise ReqlRuntimeError, "No last connection.  Use RethinkDB::Connection.new."

data/lib/ql2.pb.rb

@@ -22,6 +22,7 @@ module RethinkDB
 			CONTINUE = 2
 			STOP = 3
 			NOREPLY_WAIT = 4
+			SERVER_INFO = 5
 		end
 		
 		module AssocPair
@@ -44,6 +45,7 @@ module RethinkDB
 			SUCCESS_SEQUENCE = 2
 			SUCCESS_PARTIAL = 3
 			WAIT_COMPLETE = 4
+			SERVER_INFO = 5
 			CLIENT_ERROR = 16
 			COMPILE_ERROR = 17
 			RUNTIME_ERROR = 18
@@ -127,6 +129,7 @@ module RethinkDB
 			CONTAINS = 93
 			GET_FIELD = 31
 			KEYS = 94
+			VALUES = 186
 			OBJECT = 143
 			HAS_FIELDS = 32
 			WITH_FIELDS = 96

data/lib/shim.rb

@@ -74,7 +74,7 @@ module RethinkDB
             when re::USER             then raise ReqlUserError,             r['r'][0]
             else                           raise ReqlRuntimeError,          r['r'][0]
           end
-        when rt::COMPILE_ERROR        then raise ReqlCompileError,          r['r'][0]
+        when rt::COMPILE_ERROR        then raise ReqlServerCompileError,    r['r'][0]
         when rt::CLIENT_ERROR         then raise ReqlDriverError,           r['r'][0]
         else raise ReqlRuntimeError, "Unexpected response: #{r.inspect}"
         end
@@ -102,21 +102,21 @@ module RethinkDB
                     when RQL then x.to_pb
                     else { '$reql_type$' => 'BINARY', 'data' => Base64.strict_encode64(x) }
                     end
-                 }, []])
+                 }])
     end
 
     def self.safe_to_s(x)
       case x
       when String then x
       when Symbol then x.to_s
-      else raise ReqlDriverError, 'Object keys must be strings or symbols.  '+
+      else raise ReqlDriverCompileError, 'Object keys must be strings or symbols.  '+
           "(Got object `#{x.inspect}` of class `#{x.class}`.)"
       end
     end
 
     def self.fast_expr(x, max_depth)
       if max_depth == 0
-        raise ReqlDriverError, "Maximum expression depth exceeded " +
+        raise ReqlDriverCompileError, "Maximum expression depth exceeded " +
           "(you can override this with `r.expr(X, MAX_DEPTH)`)."
       end
       case x
@@ -143,15 +143,15 @@ module RethinkDB
         RQL.new({ '$reql_type$' => 'TIME',
                   'epoch_time'  => epoch_time,
                   'timezone'    => tz })
-      else raise ReqlDriverError, "r.expr can't handle #{x.inspect} of class #{x.class}."
+      else raise ReqlDriverCompileError, "r.expr can't handle #{x.inspect} of class #{x.class}."
       end
     end
 
     def expr(x, max_depth=20)
-      unbound_if(@body != RQL)
-      if !max_depth.is_a?(Numeric)
-        raise ReqlDriverError, "Second argument to `r.expr` must be a number."
+      if not max_depth.is_a? Numeric
+        raise ReqlDriverCompileError, "Second argument to `r.expr` must be a number."
       end
+      unbound_if(@body != RQL)
       RQL.fast_expr(x, max_depth)
     end
     def coerce(other)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rethinkdb
 version: !ruby/object:Gem::Version
-  version: 2.1.0.2
+  version: 2.2.0.0
 platform: ruby
 authors:
 - RethinkDB Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,13 +30,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ql2.pb.rb
 - lib/exc.rb
 - lib/func.rb
 - lib/net.rb
-- lib/rethinkdb.rb
 - lib/rpp.rb
+- lib/rethinkdb.rb
 - lib/shim.rb
-- lib/ql2.pb.rb
 homepage: http://rethinkdb.com
 licenses:
 - Apache-2