rethinkdb 1.11.0.0 → 1.11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003e171146b67e41c8f89bf9c85f21f6860dace3
-  data.tar.gz: 34fc0e2e3df5e8655d12e6b6d402784e7a390a49
+  metadata.gz: d589a0dca4408818f9436f1de68c0b308f3d5e90
+  data.tar.gz: da8263048750b9f9849dd603423a749f64f011ac
 SHA512:
-  metadata.gz: 6ae00357bc05acf7cb924aa63c919d3f40da606e0141be9c073548e669bc2c738a94c38400aac13ffb536fe6a45252c691ae7dfd77d3fe04aa8856e4b289b8f1
-  data.tar.gz: d80dfbcb3236697469b8555aa734840cac09cda41e60d6daa1e637780069b99ff08b9dfc81f218eef10b01c1b0a9bb8d46ff08ed40d894f4b963bf043b641c24
+  metadata.gz: 5e6cdf08230b8c639fe7b27b85c99e511cec21dd8d20646ab148dac3dbb70380c2226b5c97a346f25a5ce06a880c01334db89221bbb81379e1e9a7c4dfe83390
+  data.tar.gz: 13e9754e90e8c7dabb4831265bb9a2ad72c10ee534cff87bc711f2bd02fb8810048a5d64bb29ba794106526b183bb60fbbc5afe3d8288d3301f00cbbd19539ec

data/lib/func.rb

@@ -99,9 +99,10 @@ module RethinkDB
     end
     def groupby(*a, &b); group_by(*a, &b); end
 
-    def connect(*args)
+    def connect(*args, &b)
       unbound_if @body
-      Connection.new(*args)
+      c = Connection.new(*args)
+      b ? begin b.call(c) ensure c.close end : c
     end
 
     def avg(attr)

data/lib/net.rb

@@ -22,7 +22,7 @@ module RethinkDB
   class RQL
     @@default_conn = nil
     def self.set_default_conn c; @@default_conn = c; end
-    def run(c=@@default_conn, opts=nil)
+    def run(c=@@default_conn, opts=nil, &b)
       # $f.puts "("+RPP::pp(@body)+"),"
       unbound_if !@body
       c, opts = @@default_conn, c if opts.nil? && !c.kind_of?(RethinkDB::Connection)
@@ -38,7 +38,7 @@ module RethinkDB
         raise ArgumentError, "No connection specified!\n" \
         "Use `query.run(conn)` or `conn.repl(); query.run`."
       end
-      c.run(@body, opts)
+      c.run(@body, opts, &b)
     end
   end
 
@@ -86,6 +86,18 @@ module RethinkDB
         end
       end
     end
+
+    def close
+      if @more
+        @more = false
+        q = RethinkDB::new_query(Query::QueryType::STOP, @token)
+        res = @conn.run_internal q
+        if res.type != Response::ResponseType::SUCCESS_SEQUENCE || res.response != []
+          raise RqlRuntimeError, "Server sent malformed STOP response #{PP.pp(res, "")}"
+        end
+        return true
+      end
+    end
   end
 
   class Connection
@@ -120,7 +132,7 @@ module RethinkDB
       dispatch q
       noreply ? nil : wait(q.token)
     end
-    def run(msg, opts)
+    def run(msg, opts, &b)
       reconnect(:noreply_wait => false) if @auto_reconnect && (!@socket || !@listener)
       raise RqlRuntimeError, "Error: Connection Closed." if !@socket || !@listener
       q = RethinkDB::new_query(Query::QueryType::START, @@token_cnt += 1)
@@ -154,10 +166,20 @@ module RethinkDB
       end
 
       if res.respond_to? :has_profile? and res.has_profile?
-          {"profile" => Shim.datum_to_native(res.profile(), opts),
-           "value" => value}
+          real_val = {"profile" => Shim.datum_to_native(res.profile(), opts),
+                      "value" => value}
+      else
+          real_val = value
+      end
+
+      if b
+        begin
+          b.call(real_val)
+        ensure
+          value.close if value.class == Cursor
+        end
       else
-          value
+        real_val
       end
     end
 

data/lib/shim.rb

@@ -2,7 +2,41 @@ require 'json'
 require 'time'
 
 module RethinkDB
+
   module Shim
+
+    def self.is_reql_time(obj)
+      obj.is_a? Hash and obj["$reql_type$"] == "TIME"
+    end
+
+    def self.convert_time(obj)
+      t = Time.at(obj['epoch_time'])
+      tz = obj['timezone']
+      (tz && tz != "" && tz != "Z") ? t.getlocal(tz) : t.utc
+    end
+
+    def self.convert_times!(result)
+      case result
+      when Hash
+        result.each { |k, v|
+          if is_reql_time v
+            result[k] = convert_time v
+          else
+            convert_times! v
+          end
+        }
+      when Array
+        result.each_index { |i|
+          if is_reql_time result[i]
+            result[i] = convert_time result[i]
+          else
+            convert_times! result[i]
+          end
+        }
+      end
+      result
+    end
+
     def self.datum_to_native(d, opts)
       raise RqlRuntimeError, "SHENANIGANS" if d.class != Datum
       dt = Datum::DatumType
@@ -14,15 +48,18 @@ module RethinkDB
       when dt::R_ARRAY then d.r_array.map{|d2| datum_to_native(d2, opts)}
       when dt::R_OBJECT then
         obj = Hash[d.r_object.map{|x| [x.key, datum_to_native(x.val, opts)]}]
-        if obj["$reql_type$"] == "TIME" && opts[:time_format] != 'raw'
-          t = Time.at(obj['epoch_time'])
-          tz = obj['timezone']
-          (tz && tz != "" && tz != "Z") ? t.getlocal(tz) : t.utc
+        if opts[:time_format] != 'raw'
+          is_reql_time(obj) ? convert_time(obj) : obj
         else
           obj
         end
       when dt::R_JSON then
-        JSON.parse("[" + d.r_str + "]")[0]
+        result = JSON.parse("[" + d.r_str + "]")[0]
+        if opts[:time_format] != 'raw'
+          is_reql_time(result) ? convert_time(result) : convert_times!(result)
+        else
+          result
+        end
       else raise RqlRuntimeError, "#{dt} Unimplemented."
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rethinkdb
 version: !ruby/object:Gem::Version
-  version: 1.11.0.0
+  version: 1.11.0.1
 platform: ruby
 authors:
 - RethinkDB Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json