rethinkdb 1.13.0.1 → 1.14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fe6c545db48fca4ef50d6963dcce1b12a54df31
-  data.tar.gz: c6e34a121b3704940df425d3f88588de7b48e6cb
+  metadata.gz: b14d4516dee0a85107a2f9e59e508df5d6282245
+  data.tar.gz: cdb4c4f58579fe6bc7996782d5101cb3aa0bc40e
 SHA512:
-  metadata.gz: 4ee1c1b7cbcddec88fb0fc2795f6e93dbae157ea7dcd23f13f363f8d961bdf1db2f3bcb4161719857a84dbaa01a14da674bc9540a2e5d88acad439c3d007b676
-  data.tar.gz: 5f9a985e76c85c3289d1079e1f9c4ce268305cdf349dcf0cab98fc1163e0210eee39b27e2cf4b6105b92aaa6a77c8f6cbcaf664d9ef813e849e4c5fdebc9f249
+  metadata.gz: d4fdf55ab09026bd76c33f3803863f896f8c92c5a0b1f5f8dd69744fb672dde9f80913eefd46774d60c6af6d7863f407f48cfc44b080d64ee573b10c57865ffa
+  data.tar.gz: 522abfe5ea3458ce2ddbbb5cd8e400a6709d7e8c97a986877e976bf450026112f7a3369ab885eb5f1abb7e1c116736d53283e96a758c78d37955a64fb2f74280

data/lib/func.rb

@@ -35,8 +35,10 @@ module RethinkDB
       :group => -1,
       :iso8601 => -1,
       :index_create => -1,
+      :index_rename => -1,
       :random => -1,
-      :http => 1
+      :http => 1,
+      :distinct => -1
     }
     @@method_aliases = {
       :lt => :<,
@@ -58,6 +60,11 @@ module RethinkDB
     }
 
     termtypes = Term::TermType.constants.map{ |c| c.to_sym }
+
+    # r.binary has different behavior when operating on client-side strings vs
+    # terms on the server
+    termtypes.delete(:BINARY)
+
     termtypes.each {|termtype|
 
       method_body = proc { |*a, &b|
@@ -137,7 +144,7 @@ module RethinkDB
     def do(*args, &b)
       a = ((@body != RQL) ? [self] : []) + args.dup
       if a == [] && !b
-        raise RqlDriverError, "Expected 1 or more argument(s) but found 0."
+        raise RqlDriverError, "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

@@ -28,6 +28,12 @@ module RethinkDB
           raise ArgumentError, "`group_format` must be 'raw' or 'native' (got `#{gf}`)."
         end
       end
+      if (bf = opts[:binary_format])
+        opts[:binary_format] = (bf = bf.to_s)
+        if bf != 'raw' && bf != 'native'
+          raise ArgumentError, "`binary_format` must be 'raw' or 'native' (got `#{bf}`)."
+        end
+      end
       if !c
         raise ArgumentError, "No connection specified!\n" \
         "Use `query.run(conn)` or `conn.repl(); query.run`."
@@ -124,11 +130,18 @@ module RethinkDB
       @@last = self
       @default_opts = default_db ? {:db => RQL.new.db(default_db)} : {}
       @conn_id = 0
+
+      @token_cnt = 0
+      @token_cnt_mutex = Mutex.new
+
       reconnect(:noreply_wait => false)
     end
     attr_reader :default_db, :conn_id
 
-    @@token_cnt = 0
+    def new_token
+      @token_cnt_mutex.synchronize{@token_cnt += 1}
+    end
+
     def set_opts(token, opts)
       @mutex.synchronize{@opts[token] = opts}
     end
@@ -149,7 +162,7 @@ module RethinkDB
         all_opts[:noreply] = !!all_opts[:noreply]
       end
 
-      token = (@@token_cnt += 1)
+      token = new_token
       q = [Query::QueryType::START,
            msg,
            Hash[all_opts.map {|k,v|
@@ -279,7 +292,7 @@ module RethinkDB
     def noreply_wait
       raise RqlRuntimeError, "Error: Connection Closed." if !@socket || !@listener
       q = [Query::QueryType::NOREPLY_WAIT]
-      res = run_internal(q, {noreply: false}, @@token_cnt += 1)
+      res = run_internal(q, {noreply: false}, new_token)
       if res['t'] != Response::ResponseType::WAIT_COMPLETE
         raise RqlRuntimeError, "Unexpected response to noreply_wait: " + PP.pp(res, "")
       end

data/lib/ql2.pb.rb

@@ -148,6 +148,7 @@ module RethinkDB
 			INDEX_LIST = 77
 			INDEX_STATUS = 139
 			INDEX_WAIT = 140
+			INDEX_RENAME = 156
 			FUNCALL = 64
 			BRANCH = 65
 			ANY = 66
@@ -212,6 +213,7 @@ module RethinkDB
 			RANDOM = 151
 			CHANGES = 152
 			ARGS = 154
+			BINARY = 155
 		end
 		
 		module AssocPair

data/lib/rpp.rb

@@ -11,6 +11,31 @@ module RethinkDB
       (bt && bt[0] == el) ? bt[1..-1] : nil
     end
 
+    def self.pp_pseudotype(q, pt, bt)
+      if not pt.has_key?('$reql_type$')
+        return false
+      end
+
+      case pt['$reql_type$']
+      when 'TIME' then
+        if not (pt.has_key?('epoch_time') and pt.has_key?('timezone'))
+          return false
+        end
+        t = Time.at(pt['epoch_time'])
+        tz = pt['timezone']
+        t = (tz && tz != "" && tz != "Z") ? t.getlocal(tz) : t.utc
+        q.text("r.expr(#{t.inspect})")
+      when 'BINARY' then
+        if not (pt.has_key?('data'))
+          return false
+        end
+        q.text("<data>")
+      else return false
+      end
+
+      return true
+    end
+
     def self.pp_int_optargs(q, optargs, bt, pre_dot = false)
       q.text("r(") if pre_dot
       q.group(1, "{", "}") {
@@ -73,7 +98,7 @@ module RethinkDB
     end
 
     def self.can_prefix (name, args)
-      return !["db", "table", "funcall", "args", "branch"].include?(name)
+      return !["db", "table", "funcall", "args", "branch", "http", "binary"].include?(name)
     end
     def self.pp_int(q, term, bt, pre_dot=false)
       q.text("\x7", 0) if bt == []
@@ -82,7 +107,9 @@ module RethinkDB
       # PP.pp [:pp_int, term.to_json, bt]
       if term.class != Array
         if term.class == Hash
-          pp_int_optargs(q, term, bt, pre_dot)
+          if not pp_pseudotype(q, term, bt)
+            pp_int_optargs(q, term, bt, pre_dot)
+          end
         else
           pp_int_datum(q, term, pre_dot)
         end

data/lib/shim.rb

@@ -1,8 +1,14 @@
 module RethinkDB
   require 'json'
   require 'time'
+  require 'base64'
+
+  # Use a dummy object for binary data so we don't lose track of the data type
+  class Binary < String
+  end
+
   module Shim
-    def self.recursive_munge(x, parse_time, parse_group)
+    def self.recursive_munge(x, parse_time, parse_group, parse_binary)
       case x
       when Hash
         if parse_time && x['$reql_type$'] == 'TIME'
@@ -11,15 +17,17 @@ module RethinkDB
           return (tz && tz != "" && tz != "Z") ? t.getlocal(tz) : t.utc
         elsif parse_group && x['$reql_type$'] == 'GROUPED_DATA'
           return Hash[x['data']]
+        elsif parse_binary && x['$reql_type$'] == 'BINARY'
+          return Binary.new(Base64.decode64(x['data'])).force_encoding('BINARY')
         else
           x.each {|k, v|
-            v2 = recursive_munge(v, parse_time, parse_group)
+            v2 = recursive_munge(v, parse_time, parse_group, parse_binary)
             x[k] = v2 if v.object_id != v2.object_id
           }
         end
       when Array
         x.each_with_index {|v, i|
-          v2 = recursive_munge(v, parse_time, parse_group)
+          v2 = recursive_munge(v, parse_time, parse_group, parse_binary)
           x[i] = v2 if v.object_id != v2.object_id
         }
       end
@@ -29,7 +37,8 @@ module RethinkDB
     def self.load_json(target, opts=nil)
       recursive_munge(JSON.parse(target, max_nesting: false),
                       opts && opts[:time_format] != 'raw',
-                      opts && opts[:group_format] != 'raw')
+                      opts && opts[:group_format] != 'raw',
+                      opts && opts[:binary_format] != 'raw')
     end
 
     def self.dump_json(x)
@@ -61,6 +70,16 @@ module RethinkDB
     end
     def to_pb; @body; end
 
+    def binary(*a)
+        args = ((@body != RQL) ? [self] : []) + a
+        RQL.new([Term::TermType::BINARY, args.map {|x|
+                    case x
+                    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
@@ -82,6 +101,7 @@ module RethinkDB
       when Hash then RQL.new(Hash[x.map{|k,v| [safe_to_s(k),
                                                fast_expr(v, max_depth-1)]}])
       when Proc then RQL.new.new_func(&x)
+      when Binary then RQL.new.binary(x)
       when String then RQL.new(x)
       when Symbol then RQL.new(x)
       when Numeric then RQL.new(x)

metadata

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