rethinkdb 1.7.0.0 → 1.8.0.0

data/lib/func.rb

@@ -15,15 +15,19 @@ module RethinkDB
     # only be removed from the argument list and treated as an optarg
     # if it's a Hash.  A positive value is necessary for functions
     # that can take a hash for the last non-optarg argument.
+    # NOTE: we search for the optarg after we apply the rewrite rules below.
+    # For example we need to use orderby not order_by
     @@optarg_offsets = {
       :replace => {:with_block => 0, :without => 1},
       :update => {:with_block => 0, :without => 1},
       :insert => 1,
       :delete => -1,
-      :reduce => -1, :between => -1, :grouped_map_reduce => -1,
+      :reduce => -1, :between => 2, :grouped_map_reduce => -1,
       :table => -1, :table_create => -1,
       :get_all => -1, :eq_join => -1,
-      :javascript => -1, :filter => {:with_block => 0, :without => 1}
+      :javascript => -1, :filter => {:with_block => 0, :without => 1},
+      :slice => -1, :during => -1, :orderby => -1,
+      :iso8601 => -1
     }
     @@rewrites = {
       :< => :lt, :<= => :le, :> => :gt, :>= => :ge,
@@ -130,10 +134,8 @@ module RethinkDB
       elsif ind.class == Symbol || ind.class == String
         return get_field(ind)
       elsif ind.class == Range
-        if ind.end == 0 && ind.exclude_end?
-          raise ArgumentError, "Cannot slice to an excluded end of 0."
-        end
-        return slice(ind.begin, ind.end - (ind.exclude_end? ? 1 : 0))
+        return slice(ind.begin, ind.end, :right_bound =>
+                     (ind.exclude_end? ? 'open' : 'closed'))
       end
       raise ArgumentError, "[] cannot handle #{ind.inspect} of type #{ind.class}."
     end

data/lib/net.rb

@@ -20,6 +20,12 @@ module RethinkDB
       c, opts = @@default_conn, c if opts.nil? && !c.kind_of?(RethinkDB::Connection)
       opts = {} if opts.nil?
       opts = {opts => true} if opts.class != Hash
+      if (tf = opts[:time_format])
+        opts[:time_format] = (tf = tf.to_s)
+        if tf != 'raw' && tf != 'native'
+          raise ArgumentError, "`time_format` must be 'raw' or 'native' (got `#{tf}`)."
+        end
+      end
       if !c
         raise ArgumentError, "No connection specified!\n" \
         "Use `query.run(conn)` or `conn.repl(); query.run`."
@@ -46,13 +52,14 @@ module RethinkDB
         (@run ? "" : "\n#{preview}") + ">"
     end
 
-    def initialize(results, msg, connection, token, more = true) # :nodoc:
+    def initialize(results, msg, connection, opts, token, more = true) # :nodoc:
       @more = more
       @results = results
       @msg = msg
       @run = false
       @conn_id = connection.conn_id
       @conn = connection
+      @opts = opts
       @token = token
     end
 
@@ -67,7 +74,7 @@ module RethinkDB
         q.type = Query::QueryType::CONTINUE
         q.token = @token
         res = @conn.run_internal q
-        @results = Shim.response_to_native(res, @msg)
+        @results = Shim.response_to_native(res, @msg, @opts)
         if res.type == Response::ResponseType::SUCCESS_SEQUENCE
           @more = false
         end
@@ -133,11 +140,13 @@ module RethinkDB
       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)
+        Cursor.new(Shim.response_to_native(res, msg, opts),
+                   msg, self, opts, q.token, true)
       elsif res.type == Response::ResponseType::SUCCESS_SEQUENCE
-        Cursor.new(Shim.response_to_native(res, msg), msg, self, q.token, false)
+        Cursor.new(Shim.response_to_native(res, msg, opts),
+                   msg, self, opts, q.token, false)
       else
-        Shim.response_to_native(res, msg)
+        Shim.response_to_native(res, msg, opts)
       end
     end
 
@@ -259,11 +268,23 @@ module RethinkDB
           rescue
             raise RqlRuntimeError, "Bad Protobuf #{response}, server is buggy."
           end
-          @mutex.synchronize do
-            @data[protob.token] = protob
-            if (@waiters[protob.token])
-              cond = @waiters.delete protob.token
-              cond.signal
+          if protob.token == -1
+            @mutex.synchronize do
+              @waiters.keys.each {|k|
+                @data[k] = protob
+                if @waiters[k]
+                  cond = @waiters.delete k
+                  cond.signal
+                end
+              }
+            end
+          else
+            @mutex.synchronize do
+              @data[protob.token] = protob
+              if @waiters[protob.token]
+                cond = @waiters.delete protob.token
+                cond.signal
+              end
             end
           end
         end

data/lib/ql2.pb.rb

@@ -215,6 +215,45 @@ class Term < ::ProtocolBuffers::Message
     SAMPLE = 81
     DEFAULT = 92
     JSON = 98
+    ISO8601 = 99
+    TO_ISO8601 = 100
+    EPOCH_TIME = 101
+    TO_EPOCH_TIME = 102
+    NOW = 103
+    IN_TIMEZONE = 104
+    DURING = 105
+    DATE = 106
+    TIME_OF_DAY = 126
+    TIMEZONE = 127
+    YEAR = 128
+    MONTH = 129
+    DAY = 130
+    DAY_OF_WEEK = 131
+    DAY_OF_YEAR = 132
+    HOURS = 133
+    MINUTES = 134
+    SECONDS = 135
+    TIME = 136
+    MONDAY = 107
+    TUESDAY = 108
+    WEDNESDAY = 109
+    THURSDAY = 110
+    FRIDAY = 111
+    SATURDAY = 112
+    SUNDAY = 113
+    JANUARY = 114
+    FEBRUARY = 115
+    MARCH = 116
+    APRIL = 117
+    MAY = 118
+    JUNE = 119
+    JULY = 120
+    AUGUST = 121
+    SEPTEMBER = 122
+    OCTOBER = 123
+    NOVEMBER = 124
+    DECEMBER = 125
+    LITERAL = 137
   end
 
   # nested messages

data/lib/rpp.rb

@@ -50,7 +50,7 @@ module RethinkDB
 
     def self.pp_int_datum(q, dat, pre_dot)
       q.text("r(") if pre_dot
-      q.text(Shim.datum_to_native(dat).inspect)
+      q.text(Shim.datum_to_native(dat, :time_format => 'raw').inspect)
       q.text(")") if pre_dot
     end
 

data/lib/shim.rb

@@ -1,8 +1,9 @@
 require 'json'
+require 'time'
 
 module RethinkDB
   module Shim
-    def self.datum_to_native d
+    def self.datum_to_native(d, opts)
       raise RqlRuntimeError, "SHENANIGANS" if d.class != Datum
       dt = Datum::DatumType
       case d.type
@@ -10,13 +11,21 @@ module RethinkDB
       when dt::R_STR then d.r_str
       when dt::R_BOOL then d.r_bool
       when dt::R_NULL then nil
-      when dt::R_ARRAY then d.r_array.map{|d2| datum_to_native d2}
-      when dt::R_OBJECT then Hash[d.r_object.map{|x| [x.key, datum_to_native(x.val)]}]
+      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
+        else
+          obj
+        end
       else raise RqlRuntimeError, "Unimplemented."
       end
     end
 
-    def self.response_to_native(r, orig_term)
+    def self.response_to_native(r, orig_term, opts)
       rt = Response::ResponseType
       if r.backtrace
         bt = r.backtrace.frames.map {|x|
@@ -28,9 +37,9 @@ module RethinkDB
 
       begin
         case r.type
-        when rt::SUCCESS_ATOM then datum_to_native(r.response[0])
-        when rt::SUCCESS_PARTIAL then r.response.map{|d| datum_to_native(d)}
-        when rt::SUCCESS_SEQUENCE then r.response.map{|d| datum_to_native(d)}
+        when rt::SUCCESS_ATOM then datum_to_native(r.response[0], opts)
+        when rt::SUCCESS_PARTIAL then r.response.map{|d| datum_to_native(d, opts)}
+        when rt::SUCCESS_SEQUENCE then r.response.map{|d| datum_to_native(d, opts)}
         when rt::RUNTIME_ERROR then
           raise RqlRuntimeError, "#{r.response[0].r_str}"
         when rt::COMPILE_ERROR then # TODO: remove?
@@ -82,6 +91,13 @@ module RethinkDB
       return t
     end
 
+    def timezone_from_offset(offset)
+      raw_offset = offset.abs
+      raw_hours = raw_offset / 3600
+      raw_minutes = (raw_offset / 60) - (raw_hours * 60)
+      return (offset < 0 ? "-" : "+") + sprintf("%02d:%02d", raw_hours, raw_minutes);
+    end
+
     def fast_expr(x, context, allow_json)
       return x if x.class == RQL
       if @@datum_types.include?(x.class)
@@ -123,11 +139,33 @@ module RethinkDB
       end
     end
 
+    def check_depth depth
+      raise RqlRuntimeError, "Maximum expression depth of 20 exceeded." if depth > 20
+    end
+
+    def reql_typify(tree, depth=0)
+      check_depth(depth)
+      case tree
+      when Array
+        return tree.map{|x| reql_typify(x, depth+1)}
+      when Hash
+        return Hash[tree.map{|k,v| [k, reql_typify(v, depth+1)]}]
+      when Time
+        return {
+          '$reql_type$' => 'TIME',
+          'epoch_time'  => tree.to_f,
+          'timezone'    => timezone_from_offset(tree.utc_offset)
+        }
+      else
+        return tree
+      end
+    end
+
     def expr(x, opts={})
       allow_json = opts[:allow_json]
       unbound_if @body
       context = RPP.sanitize_context(caller)
-      res = fast_expr(x, context, allow_json)
+      res = fast_expr(reql_typify(x), context, allow_json)
       return res if res.class == RQL
       return RQL.new(any_to_pb(res, context), nil, context)
     end

metadata

@@ -1,99 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rethinkdb
-version: !ruby/object:Gem::Version 
-  hash: 103
+version: !ruby/object:Gem::Version
+  version: 1.8.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 7
-  - 0
-  - 0
-  version: 1.7.0.0
 platform: ruby
-authors: 
+authors:
 - RethinkDB Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17292480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-protocol-buffers
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17292480
+- !ruby/object:Gem::Dependency
+  name: ruby-protocol-buffers
+  requirement: &17291140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *17291140
 description: 
 email: bugs@rethinkdb.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/exc.rb
 - lib/ql2.pb.rb
-- lib/func.rb
-- lib/net.rb
 - lib/rethinkdb.rb
+- lib/net.rb
 - lib/rpp.rb
 - lib/shim.rb
+- lib/func.rb
 homepage: http://rethinkdb.com
-licenses: 
+licenses:
 - Apache-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.0
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: This package provides the Ruby driver library for the RethinkDB database server.
+summary: This package provides the Ruby driver library for the RethinkDB database
+  server.
 test_files: []
-