rethinkdb 1.4.0.2 → 1.5.0.0

data/lib/func.rb

@@ -12,7 +12,9 @@ module RethinkDB
     }
     @@opt_off = {
       :reduce => -1, :between => -1, :grouped_map_reduce => -1,
-      :table => -1, :table_create => -1
+      :table => -1, :table_create => -1,
+      :get_all => -1, :eq_join => -1,
+      :javascript => -1
     }
     @@rewrites = {
       :< => :lt, :<= => :le, :> => :gt, :>= => :ge,
@@ -27,6 +29,7 @@ module RethinkDB
       :type_of => :typeof
     }
     def method_missing(m, *a, &b)
+      unbound_if(m.to_s.downcase != m.to_s, m)
       bitop = [:"|", :"&"].include?(m) ? [m, a, b] : nil
       if [:<, :<=, :>, :>=, :+, :-, :*, :/, :%].include?(m)
         a.each {|arg|
@@ -114,10 +117,6 @@ module RethinkDB
       super(*a, &b)
     end
 
-    def between(l=nil, r=nil)
-      super(Hash[(l ? [['left_bound', l]] : []) + (r ? [['right_bound', r]] : [])])
-    end
-
     def -@; RQL.new.sub(0, self); end
 
     def [](ind)

data/lib/net.rb

@@ -93,24 +93,34 @@ module RethinkDB
     attr_reader :default_db, :conn_id
 
     @@token_cnt = 0
-    def run_internal q
+    def run_internal(q, noreply=false)
       dispatch q
-      wait q.token
+      noreply ? nil : wait(q.token)
     end
     def run(msg, opts)
+      raise RuntimeError, "Error: Connection Closed." if !@socket || !@listener
       q = Query.new
       q.type = Query::QueryType::START
       q.query = msg
       q.token = @@token_cnt += 1
 
-      @default_opts.merge(opts).each {|k,v|
+      all_opts = @default_opts.merge(opts)
+      if all_opts.keys.include?(:noreply)
+        all_opts[:noreply] = !!all_opts[:noreply]
+      end
+      all_opts.each {|k,v|
         ap = Query::AssocPair.new
         ap.key = k.to_s
-        ap.val = v.to_pb
+        if v.class == RQL
+          ap.val = v.to_pb
+        else
+          ap.val = RQL.new.expr(v).to_pb
+        end
         q.global_optargs << ap
       }
 
-      res = run_internal q
+      res = run_internal(q, all_opts[:noreply])
+      return res if !res
       if res.type == Response::ResponseType::SUCCESS_PARTIAL
         Cursor.new(Shim.response_to_native(res, msg), msg, self, q.token, true)
       elsif res.type == Response::ResponseType::SUCCESS_SEQUENCE
@@ -121,7 +131,7 @@ module RethinkDB
     end
 
     def send packet
-      @socket.send(packet, 0)
+      @socket.write(packet)
     end
 
     def dispatch msg
@@ -201,7 +211,7 @@ module RethinkDB
           return buf
         end
       end
-      @socket.send([@@magic_number].pack('L<'), 0)
+      @socket.write([@@magic_number].pack('L<'))
       @listener.terminate if @listener
       @listener = Thread.new do
         loop do

data/lib/ql2.pb.rb

@@ -4,13 +4,17 @@
 # //                            THE HIGH-LEVEL VIEW                             //
 # ////////////////////////////////////////////////////////////////////////////////
 # 
-# // 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, 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
+# // Process: When you first open a connection, 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.  This number should
+# // only be sent once per connection.
+# 
+# // Next, for each query you want to send, 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
@@ -48,7 +52,10 @@
 #     // A [Term] is how we represent the operations we want a query to perform.
 #     optional Term query = 2; // only present when [type] = [START]
 #     optional int64 token = 3;
-#     optional bool noreply = 4 [default = false]; // CURRENTLY IGNORED, NO SERVER SUPPORT
+#     // This flag is ignored on the server.  `noreply` should be added
+#     // to `global_optargs` instead (the key "noreply" should map to
+#     // either true or false).
+#     optional bool OBSOLETE_noreply = 4 [default = false];
 # 
 #     message AssocPair {
 #         optional string key = 1;
@@ -162,6 +169,9 @@
 # // terms).  These are marked with a `!`.
 # // Optional arguments are specified within curly braces as argname `:` value
 # // type (e.x `{use_outdated:BOOL}`)
+# // Many RQL operations are polymorphic. For these, alterantive type signatures
+# // are separated by `|`.
+# //
 # // The RQL type hierarchy is as follows:
 # //   Top
 # //     DATUM
@@ -179,6 +189,7 @@
 # //           Table
 # //     Database
 # //     Function
+# //     Ordering - used only by ORDER_BY
 # //   Error
 # message Term {
 #     enum TermType {
@@ -198,7 +209,8 @@
 #         // libraries, and because it's more efficient on the wire.)
 #         VAR          = 10; // !NUMBER -> DATUM
 #         // Takes some javascript code and executes it.
-#         JAVASCRIPT   = 11; // STRING -> DATUM | STRING -> Function(*)
+#         JAVASCRIPT   = 11; // STRING {timeout: !NUMBER} -> DATUM |
+#                            // STRING {timeout: !NUMBER} -> Function(*)
 #         // Takes a string and throws an error with that message.
 #         ERROR        = 12; // STRING -> Error
 #         // Takes nothing and returns a reference to the implicit variable.
@@ -209,9 +221,10 @@
 #         DB    = 14; // STRING -> Database
 #         // Returns a reference to a table.
 #         TABLE = 15; // Database, STRING, {use_outdated:BOOL} -> Table | STRING, {use_outdated:BOOL} -> Table
-#         // Gets a single element from a table by its primary key.
+#         // Gets a single element from a table by its primary or a secondary key.
 #         GET   = 16; // Table, STRING -> SingleSelection | Table, NUMBER -> SingleSelection |
-#                     // Table, STRING -> NULL            | Table, NUMBER -> NULL
+#                     // Table, STRING -> NULL            | Table, NUMBER -> NULL |
+#         GET_ALL = 78; // Table, JSON {index:!STRING} => ARRAY
 # 
 #         // Simple DATUM Ops
 #         EQ  = 17; // DATUM... -> BOOL
@@ -253,14 +266,14 @@
 # 
 #         // Sequence Ops
 #         // Get all elements of a sequence between two values.
-#         BETWEEN   = 36; // StreamSelection, {left_bound:DATUM, right_bound:DATUM} -> StreamSelection
+#         BETWEEN   = 36; // StreamSelection, DATUM, DATUM, {:index:!STRING} -> StreamSelection
 #         REDUCE    = 37; // Sequence, Function(2), {base:DATUM} -> DATUM
 #         MAP       = 38; // Sequence, Function(1) -> Sequence
 #         FILTER    = 39; // Sequence, Function(1) -> Sequence | Sequence, OBJECT -> Sequence
 #         // Map a function over a sequence and then concatenate the results together.
 #         CONCATMAP = 40; // Sequence, Function(1) -> Sequence
 #         // Order a sequence based on one or more attributes.
-#         ORDERBY   = 41; // Sequence, !STRING... -> Sequence
+#         ORDERBY   = 41; // Sequence, (!STRING | Ordering)... -> Sequence
 #         // Get all distinct elements of a sequence (like `uniq`).
 #         DISTINCT  = 42; // Sequence -> Sequence
 #         // Count the number of elements in a sequence.
@@ -275,11 +288,17 @@
 #         // - A reduction to apply to each of the groups.
 #         GROUPED_MAP_REDUCE = 46; // Sequence, Function(1), Function(1), Function(2), {base:DATUM} -> Sequence
 #         // Groups a sequence by one or more attributes, and then applies a reduction.
-#         GROUPBY            = 47; // Sequence, ARRAY, !OBJECT -> Sequence
+#         // The third argument is a special object literal giving the kind of operation to be
+#         // performed and any necessary arguments.
+#         // At present, GROUPBY suports the following operations
+#         // * {'COUNT': <ignored>} - count the size of the group
+#         // * {'SUM': attr} - sum the values of the given attribute across the group
+#         // * {'AVG': attr} - average the values of the given attribute across the group
+#         GROUPBY            = 47; // Sequence, ARRAY, !GROUP_BY_OBJECT -> Sequence
 #         INNER_JOIN         = 48; // Sequence, Sequence, Function(2) -> Sequence
 #         OUTER_JOIN         = 49; // Sequence, Sequence, Function(2) -> Sequence
 #         // An inner-join that does an equality comparison on two attributes.
-#         EQ_JOIN            = 50; // Sequence, !STRING, Sequence -> Sequence
+#         EQ_JOIN            = 50; // Sequence, !STRING, Sequence, {index:!STRING} -> Sequence
 #         ZIP                = 72; // Sequence -> Sequence
 # 
 # 
@@ -315,12 +334,28 @@
 #         DB_DROP      = 58; // STRING -> OBJECT
 #         // Lists all the databases by name.  (Takes no arguments)
 #         DB_LIST      = 59; // -> ARRAY
-#         // Creates a table with a particular name in a particular database.
-#         TABLE_CREATE = 60; // Database, STRING, {datacenter:STRING, primary_key:STRING, cache_size:NUMBER} -> OBJECT
-#         // Drops a table with a particular name from a particular database.
+#         // Creates a table with a particular name in a particular
+#         // database.  (You may omit the first argument to use the
+#         // default database.)
+#         TABLE_CREATE = 60; // Database, STRING, {datacenter:STRING, primary_key:STRING, cache_size:NUMBER, hard_durability:BOOL} -> OBJECT
+#                            // STRING, {datacenter:STRING, primary_key:STRING, cache_size:NUMBER, hard_durability:BOOL} -> OBJECT
+#         // Drops a table with a particular name from a particular
+#         // database.  (You may omit the first argument to use the
+#         // default database.)
 #         TABLE_DROP   = 61; // Database, STRING -> OBJECT
-#         // Lists all the tables in a particular database.
+#                            // STRING -> OBJECT
+#         // Lists all the tables in a particular database.  (You may
+#         // omit the first argument to use the default database.)
 #         TABLE_LIST   = 62; // Database -> ARRAY
+#                            //  -> ARRAY
+# 
+#         // * Secondary indexes OPs
+#         // Creates a new secondary index with a particular name and definition.
+#         INDEX_CREATE = 75; // Table, STRING, Function(1) -> OBJECT
+#         // Drops a secondary index with a particular name from the specified table.
+#         INDEX_DROP   = 76; // Table, STRING -> OBJECT
+#         // Lists all secondary indexes on a particular table.
+#         INDEX_LIST   = 77; // Table -> ARRAY
 # 
 #         // * Control Operators
 #         // Calls a function on data
@@ -381,8 +416,13 @@
 #         //           }];
 #         FUNC = 69; // ARRAY, Top -> ARRAY -> Top
 # 
-#         ASC = 73;
-#         DESC = 74;
+#         // Indicates to ORDER_BY that this attribute is to be sorted in ascending order.
+#         ASC = 73; // !STRING -> Ordering
+#         // Indicates to ORDER_BY that this attribute is to be sorted in descending order.
+#         DESC = 74; // !STRING -> Ordering
+# 
+#         // Gets info about anything.  INFO is most commonly called on tables.
+#         INFO = 79; // Top -> OBJECT
 #     }
 #     optional TermType type = 1;
 # 
@@ -413,24 +453,24 @@
 # //     args = [Term {
 # //               type = TABLE;
 # //               args = [Term {
-# //                         type = R_DATUM;
-# //                         r_datum = Datum { type = R_STR; r_str = "tbl"; };
+# //                         type = DATUM;
+# //                         datum = Datum { type = R_STR; r_str = "tbl"; };
 # //                       }];
 # //               optargs = [["use_outdated",
 # //                           Term {
-# //                             type = R_DATUM;
-# //                             r_datum = Datum { type = R_BOOL; r_bool = true; };
+# //                             type = DATUM;
+# //                             datum = Datum { type = R_BOOL; r_bool = true; };
 # //                           }]];
 # //             },
 # //             Term {
-# //               type = R_ARRAY;
+# //               type = MAKE_ARRAY;
 # //               args = [Term {
-# //                         type = R_DATUM;
-# //                         r_datum = Datum { type = R_OBJECT; r_object = [["id", 0]]; };
+# //                         type = DATUM;
+# //                         datum = Datum { type = R_OBJECT; r_object = [["id", 0]]; };
 # //                       },
 # //                       Term {
-# //                         type = R_DATUM;
-# //                         r_datum = Datum { type = R_OBJECT; r_object = [["id", 1]]; };
+# //                         type = DATUM;
+# //                         datum = Datum { type = R_OBJECT; r_object = [["id", 1]]; };
 # //                       }];
 # //             }]
 # //   }
@@ -471,7 +511,7 @@ class Query < ::Protobuf::Message
   optional :QueryType, :type, 1
   optional :Term, :query, 2
   optional :int64, :token, 3
-  optional :bool, :noreply, 4, :default => false
+  optional :bool, :OBSOLETE_noreply, 4, :default => false
   class AssocPair < ::Protobuf::Message
     defined_in __FILE__
     optional :string, :key, 1
@@ -548,6 +588,7 @@ class Term < ::Protobuf::Message
     DB = value(:DB, 14)
     TABLE = value(:TABLE, 15)
     GET = value(:GET, 16)
+    GET_ALL = value(:GET_ALL, 78)
     EQ = value(:EQ, 17)
     NE = value(:NE, 18)
     LT = value(:LT, 19)
@@ -597,6 +638,9 @@ class Term < ::Protobuf::Message
     TABLE_CREATE = value(:TABLE_CREATE, 60)
     TABLE_DROP = value(:TABLE_DROP, 61)
     TABLE_LIST = value(:TABLE_LIST, 62)
+    INDEX_CREATE = value(:INDEX_CREATE, 75)
+    INDEX_DROP = value(:INDEX_DROP, 76)
+    INDEX_LIST = value(:INDEX_LIST, 77)
     FUNCALL = value(:FUNCALL, 64)
     BRANCH = value(:BRANCH, 65)
     ANY = value(:ANY, 66)
@@ -605,6 +649,7 @@ class Term < ::Protobuf::Message
     FUNC = value(:FUNC, 69)
     ASC = value(:ASC, 73)
     DESC = value(:DESC, 74)
+    INFO = value(:INFO, 79)
   end
   optional :TermType, :type, 1
   optional :Datum, :datum, 2

data/lib/rpp.rb

@@ -178,7 +178,7 @@ module RethinkDB
           end
         }.flatten.join("\n") +
           (@@context ?
-           "\nErronious_Portion_Constructed:\n" +
+           "\nErroneous_Portion_Constructed:\n" +
            "#{@@context.map{|x| "\tfrom "+x}.join("\n")}" +
            "\nCalled:" : "")
       rescue Exception => e

data/lib/shim.rb

@@ -4,7 +4,7 @@ module RethinkDB
       raise RqlRuntimeError, "SHENANIGANS" if d.class != Datum
       dt = Datum::DatumType
       case d.type
-      when dt::R_NUM then d.r_num
+      when dt::R_NUM then d.r_num == d.r_num.to_i ? d.r_num.to_i : d.r_num
       when dt::R_STR then d.r_str
       when dt::R_BOOL then d.r_bool
       when dt::R_NULL then nil
@@ -48,15 +48,15 @@ module RethinkDB
     def self.native_to_datum_term x
       dt = Datum::DatumType
       d = Datum.new
-      case x.class.hash
-      when Fixnum.hash     then d.type = dt::R_NUM;  d.r_num = x
-      when Float.hash      then d.type = dt::R_NUM;  d.r_num = x
-      when Bignum.hash     then d.type = dt::R_NUM;  d.r_num = x
-      when String.hash     then d.type = dt::R_STR;  d.r_str = x
-      when Symbol.hash     then d.type = dt::R_STR;  d.r_str = x.to_s
-      when TrueClass.hash  then d.type = dt::R_BOOL; d.r_bool = x
-      when FalseClass.hash then d.type = dt::R_BOOL; d.r_bool = x
-      when NilClass.hash   then d.type = dt::R_NULL
+      case x
+      when Fixnum     then d.type = dt::R_NUM;  d.r_num = x
+      when Float      then d.type = dt::R_NUM;  d.r_num = x
+      when Bignum     then d.type = dt::R_NUM;  d.r_num = x
+      when String     then d.type = dt::R_STR;  d.r_str = x
+      when Symbol     then d.type = dt::R_STR;  d.r_str = x.to_s
+      when TrueClass  then d.type = dt::R_BOOL; d.r_bool = x
+      when FalseClass then d.type = dt::R_BOOL; d.r_bool = x
+      when NilClass   then d.type = dt::R_NULL
       else raise RqlRuntimeError, "UNREACHABLE"
       end
       t = Term.new
@@ -72,21 +72,32 @@ module RethinkDB
     def expr(x)
       unbound_if @body
       return x if x.class == RQL
-      datum_types = [Fixnum, Float, Bignum, String, Symbol, TrueClass, FalseClass, NilClass]
-      if datum_types.map{|y| y.hash}.include? x.class.hash
+      datum_types = [Fixnum, Float, Bignum, String, Symbol,
+                     TrueClass, FalseClass, NilClass]
+
+      if datum_types.include? x.class
         return RQL.new(Shim.native_to_datum_term(x))
       end
 
       t = Term.new
-      case x.class.hash
-      when Array.hash
+      case x
+      when Array
         t.type = Term::TermType::MAKE_ARRAY
         t.args = x.map{|y| expr(y).to_pb}
-      when Hash.hash
+      when Hash
         t.type = Term::TermType::MAKE_OBJ
-        t.optargs = x.map{|k,v| ap = Term::AssocPair.new;
-          ap.key = k.to_s; ap.val = expr(v).to_pb; ap}
-      when Proc.hash
+        t.optargs = x.map{|k,v|
+          ap = Term::AssocPair.new;
+          if [Symbol, String].include? k.class
+            ap.key = k.to_s
+          else
+            raise RqlDriverError, "Object keys must be strings or symbols." +
+              "  (Got object `#{k.inspect}` of class `#{k.class}`.)"
+          end
+          ap.val = expr(v).to_pb
+          ap
+        }
+      when Proc
         t = RQL.new.new_func(&x).to_pb
       else raise RqlDriverError, "r.expr can't handle #{x.inspect} of type #{x.class}"
       end

metadata

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