rethinkdb 1.2.6.0 → 1.2.6.1

data/lib/jsons.rb

@@ -53,12 +53,16 @@ module RethinkDB
       JSON_Expression.new [:call, [:getattr, attrname], [self]]
     end
 
-    # Check whether a JSON object has a particular attribute.  The
+    # Check whether a JSON object has all of the particular attributes.  The
     # following are equivalent:
-    #   r({:id => 1}).contains(:id)
+    #   r({:id => 1, :val => 2}).contains(:id, :val)
     #   r(true)
-    def contains(attrname)
-      JSON_Expression.new [:call, [:contains, attrname], [self]]
+    def contains(*attrnames)
+      if attrnames.length == 1
+        JSON_Expression.new [:call, [:contains, attrnames[0]], [self]]
+      else
+        self.contains(attrnames[0]) & self.contains(*attrnames[1..-1])
+      end
     end
 
     # Construct a JSON object that has a subset of the attributes of

data/lib/net.rb

@@ -218,7 +218,7 @@ module RethinkDB
 
     # Close the connection.
     def close
-      @listener.terminate! if @listener
+      @listener.terminate if @listener
       @listener = nil
       @socket.close
       @socket = nil
@@ -240,7 +240,7 @@ module RethinkDB
         end
       end
       @socket.send([@@magic_number].pack('L<'), 0)
-      @listener.terminate! if @listener
+      @listener.terminate if @listener
       @listener = Thread.new do
         loop do
           begin
@@ -251,7 +251,7 @@ module RethinkDB
               @listener = nil
               @waiters.each {|kv| kv[1].signal}
             end
-            Thread.current.terminate!
+            Thread.current.terminate
             abort("unreachable")
           end
           #TODO: Recovery

data/lib/rql.rb

@@ -29,22 +29,18 @@ module RethinkDB
 
     # Construct a javascript expression, which may refer to variables in scope
     # (use <b>+to_s+</b> to get the name of a variable query, or simply splice
-    # it in).  Defaults to a javascript expression, but if the optional second
-    # argument is <b>+:func+</b>, then you may instead provide the body of a
-    # javascript function.  If you have a table <b>+table+</b>, the following
-    # are equivalent:
+    # it in). Behaves as if passed to the standard `eval` function in
+    # JavaScript. If you have a table <b>+table+</b>, the following are
+    # equivalent:
     #   table.map{|row| row[:id]}
     #   table.map{|row| r.js("#{row}.id")}
     #   table.map{r.js("this.id")} #implicit variable
-    #   table.map{r.js("return this.id;", :func)} #implicit variable
+    #   table.map{r.js("var a = this.id; a;")} #implicit variable
     # As are:
     #   r.let(:a => 1, :b => 2) { r.add(r.letvar('a'), r.letvar('b'), 1) }
     #   r.let(:a => 1, :b => 2) { r.js('a+b+1') }
-    def self.js(str, type=:expr);
-      if    type == :expr then JSON_Expression.new [:js, "return #{str}"]
-      elsif type == :func then JSON_Expression.new [:js, str]
-      else  raise TypeError, 'Type of javascript must be either :expr or :func.'
-      end
+    def self.js(str);
+      JSON_Expression.new [:js, str]
     end
 
     # Refer to the database named <b>+db_name+</b>.  Usually used as a
@@ -105,7 +101,7 @@ or Hash)."
     # Test a predicate and execute one of two branches (just like
     # Ruby's <b>+if+</b>).  For example, if we have a table
     # <b>+table+</b>:
-    #   table.update{|row| r.if(row[:score] < 10, {:score => 10}, {})}
+    #   table.update{|row| r.branch(row[:score] < 10, {:score => 10}, {})}
     # will change every row with score below 10 in <b>+table+</b> to have score 10.
     def self.branch(test, t_branch, f_branch)
       tb = S.r(t_branch)
@@ -422,6 +418,16 @@ or Hash)."
     # A shortcut for Data_Collectors::avg
     def self.avg(*args); Data_Collectors.avg(*args); end
 
+    # Specify ascending ordering for a given attribute passed to order_by.
+    def self.asc(attr)
+        return [attr, true] 
+    end
+
+    # Specify descending ordering for a given attribute passed to order_by.
+    def self.desc(attr)
+        return [attr, false]
+    end
+
     def self.boolprop(op, l, r) # :nodoc:
       badop = l.boolop? ? l : r
       if l.boolop? || r.boolop?

data/lib/sequence.rb

@@ -113,12 +113,10 @@ module RethinkDB
     # example, to sort first by name and then by social security
     # number for the table <b>+people+</b>, you could do:
     #   people.order_by(:name, :ssn)
-    # In place of an attribute name, you may provide a tuple of an attribute
-    # name and a boolean specifying whether to sort in ascending order (which is
-    # the default).  For example:
-    #   people.order_by([:name, false], :ssn)
-    # will sort first by name in descending order, and then by ssn in ascending
-    # order.
+    # By default order_by sorts in ascending order. To explicitly specify the
+    # ordering wrap the attribute to be ordered by with r.asc or r.desc as in:
+    #   people.order_by(r.desc(:name), :ssn)
+    # which sorts first by name from Z-A and then by ssn from 0-9.
     def order_by(*orderings)
       orderings.map!{|x| x.class == Array ? x : [x, true]}
       self.class.new [:call, [:orderby, *orderings], [self]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rethinkdb
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 1
   - 2
   - 6
-  - 0
-  version: 1.2.6.0
+  - 1
+  version: 1.2.6.1
 platform: ruby
 authors: 
 - RethinkDB Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-13 00:00:00 Z
+date: 2013-01-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json