rethinkdb 1.4.0.1 → 1.4.0.2

data/lib/func.rb

@@ -100,8 +100,13 @@ module RethinkDB
     end
 
     def reduce(*a, &b)
-      a = a[1..-2] + [{:base => a[-1]}] if a.size + (@body ? 1 : 0) == 2
-      super(*a, &b)
+      args = a.dup
+      base_offset_front = (@body ? 0 : 1)
+      base_offset_back = args.size - (b ? 1 : 2)
+      if base_offset_front == base_offset_back
+        args << {:base => args.delete_at(base_offset_front)}
+      end
+      super(*args, &b)
     end
 
     def grouped_map_reduce(*a, &b)

data/lib/ql2.pb.rb

@@ -7,8 +7,11 @@
 # // Process: First send the magic number for the version of the protobuf you're
 # // targetting (in the [Version] enum).  This should **NOT** be sent as a
 # // protobuf; just send the little-endian 32-bit integer over the wire raw.
-# // Next, send [Query] protobufs and wait for [Response] protobufs with the same
-# // token.  You can see an example exchange below in **EXAMPLE**.
+# // Next, construct a [Query] protobuf and serialize it to a binary blob.  Send
+# // the blob's size to the server encoded as a little-endian 32-bit integer,
+# // followed by the blob itself.  You will recieve a [Response] protobuf back
+# // preceded by its own size, once again encoded as a little-endian 32-bit
+# // integer.  You can see an example exchange below in **EXAMPLE**.
 # 
 # // A query consists of a [Term] to evaluate and a unique-per-connection
 # // [token].
@@ -26,8 +29,8 @@
 #                        // non-conforming protobuf libraries
 #     enum Version {
 #         V0_1 = 0x3f61ba36;
-#     };
-# };
+#     }
+# }
 # 
 # // You send one of:
 # // * A [START] query with a [Term] to evaluate and a unique-per-connection token.
@@ -40,7 +43,7 @@
 #         CONTINUE = 2; // Continue a query that returned [SUCCESS_PARTIAL]
 #                       // (see [Response]).
 #         STOP     = 3; // Stop a query partway through executing.
-#     };
+#     }
 #     optional QueryType type = 1;
 #     // A [Term] is how we represent the operations we want a query to perform.
 #     optional Term query = 2; // only present when [type] = [START]
@@ -50,20 +53,20 @@
 #     message AssocPair {
 #         optional string key = 1;
 #         optional Term val = 2;
-#     };
+#     }
 #     repeated AssocPair global_optargs = 6;
-# };
+# }
 # 
 # // A backtrace frame (see `backtrace` in Response below)
 # message Frame {
 #     enum FrameType {
 #         POS = 1; // Error occured in a positional argument.
 #         OPT = 2; // Error occured in an optional argument.
-#     };
+#     }
 #     optional FrameType type = 1;
 #     optional int64 pos = 2; // The index of the positional argument.
 #     optional string opt = 3; // The name of the optional argument.
-# };
+# }
 # message Backtrace {
 #     repeated Frame frames = 1;
 # }
@@ -91,7 +94,7 @@
 #                             // if you add together two values from a table, but
 #                             // they turn out at runtime to be booleans rather
 #                             // than numbers.
-#     };
+#     }
 #     optional ResponseType type = 1;
 #     optional int64 token = 2; // Indicates what [Query] this response corresponds to.
 # 
@@ -110,7 +113,7 @@
 #     // [Term] message below.)
 # 
 #     optional Backtrace backtrace = 4; // Contains n [Frame]s when you get back an error.
-# };
+# }
 # 
 # // A [Datum] is a chunk of data that can be serialized to disk or returned to
 # // the user in a Response.  Currently we only support JSON types, but we may
@@ -123,7 +126,7 @@
 #         R_STR    = 4;
 #         R_ARRAY  = 5;
 #         R_OBJECT = 6;
-#     };
+#     }
 #     optional DatumType type = 1;
 #     optional bool r_bool = 2;
 #     optional double r_num = 3;
@@ -133,11 +136,11 @@
 #     message AssocPair {
 #         optional string key = 1;
 #         optional Datum val = 2;
-#     };
+#     }
 #     repeated AssocPair r_object = 6;
 # 
 #     extensions 10000 to 20000;
-# };
+# }
 # 
 # // A [Term] is either a piece of data (see **Datum** above), or an operator and
 # // its operands.  If you have a [Datum], it's stored in the member [datum].  If
@@ -366,7 +369,8 @@
 #         //                                 type = VAR;
 #         //                                 args = [Term {
 #         //                                           type = DATUM;
-#         //                                           datum = Datum { type = R_NUM; r_num = 1};
+#         //                                           datum = Datum { type = R_NUM;
+#         //                                                           r_num = 1};
 #         //                                         }];
 #         //                               },
 #         //                               Term {
@@ -379,7 +383,7 @@
 # 
 #         ASC = 73;
 #         DESC = 74;
-#     };
+#     }
 #     optional TermType type = 1;
 # 
 #     // This is only used when type is DATUM.
@@ -389,13 +393,13 @@
 #     message AssocPair {
 #         optional string key = 1;
 #         optional Term val = 2;
-#     };
+#     }
 #     repeated AssocPair optargs = 4; // Holds the optional arguments of the query.
 #     // (Note that the order of the optional arguments doesn't matter; think of a
 #     // Hash.)
 # 
 #     extensions 10000 to 20000;
-# };
+# }
 # 
 # ////////////////////////////////////////////////////////////////////////////////
 # //                                  EXAMPLE                                   //

data/lib/rethinkdb.rb

@@ -3,9 +3,9 @@ require 'rubygems'
 require 'ql2.pb.rb'
 
 if 2**63 != 9223372036854775808
-  puts "WARNING: Ruby believes 2**63 = #{2**63} rather than 9223372036854775808!"
-  puts "Consider upgrading your verison of Ruby."
-  puts "Hot-patching ruby_protobuf to compensate..."
+  $stderr.puts "WARNING: Ruby believes 2**63 = #{2**63} rather than 9223372036854775808!"
+  $stderr.puts "Consider upgrading your verison of Ruby."
+  $stderr.puts "Hot-patching ruby_protobuf to compensate..."
   rethinkdb_verbose, $VERBOSE = $VERBOSE, nil
   module Protobuf
     module Field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rethinkdb
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: 
   segments: 
   - 1
   - 4
   - 0
-  - 1
-  version: 1.4.0.1
+  - 2
+  version: 1.4.0.2
 platform: ruby
 authors: 
 - RethinkDB Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-18 00:00:00 Z
+date: 2013-03-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -55,12 +55,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/func.rb
-- lib/shim.rb
 - lib/exc.rb
 - lib/ql2.pb.rb
-- lib/rpp.rb
 - lib/net.rb
+- lib/rpp.rb
+- lib/shim.rb
+- lib/func.rb
 - lib/rethinkdb.rb
 homepage: http://rethinkdb.com
 licenses: