mongodb-mongo 0.6.3 → 0.6.4

data/Rakefile

@@ -4,7 +4,10 @@ require 'fileutils'
 require 'rake'
 require 'rake/testtask'
 require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
+begin
+  require 'rake/contrib/rubyforgepublisher'
+rescue LoadError
+end
 
 # NOTE: some of the tests assume Mongo is running
 Rake::TestTask.new do |t|
@@ -23,7 +26,15 @@ task :publish => [:rdoc] do
   Rake::RubyForgePublisher.new(GEM, RUBYFORGE_USER).upload
 end
 
-namespace :gem do 
+desc "Compile the extension"
+task :compile do
+  cd 'ext/cbson'
+  ruby 'extconf.rb'
+  sh 'make'
+  cp 'cbson.bundle', '../../lib/mongo/ext/cbson.bundle'
+end
+
+namespace :gem do
 
   desc "Install the gem locally"
   task :install do

data/bin/standard_benchmark

@@ -64,7 +64,7 @@ benchmark('insert (medium, no index)', insert, PER_TRIAL, db, 'medium_none', MED
 benchmark('insert (large, no index)', insert, PER_TRIAL, db, 'large_none', LARGE)
 
 index_on_x = Proc.new { |coll, object|
-  coll.create_index('foo', 'x') # TODO fix this in the driver!!
+  coll.create_index('x')
 }
 benchmark('insert (small, indexed)', insert, PER_TRIAL, db, 'small_index', SMALL, index_on_x)
 benchmark('insert (medium, indexed)', insert, PER_TRIAL, db, 'medium_index', MEDIUM, index_on_x)

data/examples/types.rb

@@ -25,8 +25,8 @@ coll.insert('array' => [1, 2, 3],
             'float' => 33.33333,
             'regex' => /foobar/i,
             'boolean' => true,
-            '$where' => 'this.x == 3', # special case of string
-            'dbref' => DBRef.new(nil, 'dbref', db, coll.name, ObjectID.new),
+            '$where' => Code.new('this.x == 3'),
+            'dbref' => DBRef.new(coll.name, ObjectID.new),
 
 # NOTE: the undefined type is not saved to the database properly. This is a
 # Mongo bug. However, the undefined type may go away completely.

data/lib/mongo/cursor.rb

@@ -18,6 +18,9 @@ require 'mongo/message'
 require 'mongo/util/byte_buffer'
 require 'mongo/util/bson'
 
+require 'logger'
+LOG = Logger.new('recv_file.log', 'daily')
+
 module XGen
   module Mongo
     module Driver
@@ -160,12 +163,15 @@ module XGen
         end
 
         def read_message_header
-          MessageHeader.new.read_header(@db.socket)
+          MessageHeader.new.read_header(@db)
         end
 
         def read_response_header
           header_buf = ByteBuffer.new
-          header_buf.put_array(@db.socket.recv(RESPONSE_HEADER_SIZE).unpack("C*"))
+          read = @db.receive_full(RESPONSE_HEADER_SIZE)
+          header_buf.put_array(read.unpack("C*"))
+          LOG.debug "resp head: #{read.inspect}\n"
+          raise "BAD SIZE" unless read.length == RESPONSE_HEADER_SIZE
           raise "Short read for DB response header; expected #{RESPONSE_HEADER_SIZE} bytes, saw #{header_buf.length}" unless header_buf.length == RESPONSE_HEADER_SIZE
           header_buf.rewind
           @result_flags = header_buf.get_int
@@ -200,13 +206,19 @@ module XGen
 
         def object_from_stream
           buf = ByteBuffer.new
-          buf.put_array(@db.socket.recv(4).unpack("C*"))
+          read1 = @db.receive_full(4)
+          buf.put_array(read1.unpack("C*"))
+          LOG.debug "size: #{read1.inspect}\n"
+          raise "BAD SIZE" unless read1.length == 4
           buf.rewind
           size = buf.get_int
-          buf.put_array(@db.socket.recv(size-4).unpack("C*"), 4)
+          read2 = @db.receive_full(size - 4)
+          buf.put_array(read2.unpack("C*"), 4)
+          LOG.debug "body: #{read2.inspect}\n"
+          raise "BAD SIZE" unless read2.length == size - 4
           @n_remaining -= 1
           buf.rewind
-          BSON.new(@db).deserialize(buf)
+          BSON.new.deserialize(buf)
         end
 
         def send_query_if_needed

data/lib/mongo/db.rb

@@ -143,7 +143,7 @@ module XGen
               @semaphore.lock if semaphore_is_locked
 
               break if @slave_ok || is_master
-            rescue => ex
+            rescue SocketError, SystemCallError, IOError => ex
               close if @socket
             end
             @socket
@@ -301,6 +301,16 @@ module XGen
           @socket != nil
         end
 
+        def receive_full(length)
+          message = ""
+          while message.length < length do
+            chunk = @socket.recv(length - message.length)
+            raise "connection closed" unless chunk.length > 0
+            message += chunk
+          end
+          message
+        end
+
         # Send a MsgMessage to the database.
         def send_message(msg)
           send_to_db(MsgMessage.new(msg))

data/lib/mongo/message/message_header.rb

@@ -16,6 +16,9 @@
 
 require 'mongo/util/byte_buffer'
 
+require 'logger'
+LOG = Logger.new('recv_file.log', 'daily')
+
 module XGen
   module Mongo
     module Driver
@@ -28,9 +31,12 @@ module XGen
           @buf = ByteBuffer.new
         end
 
-        def read_header(socket)
+        def read_header(db)
           @buf.rewind
-          @buf.put_array(socket.recv(HEADER_SIZE).unpack("C*"))
+          read = db.receive_full(HEADER_SIZE)
+          @buf.put_array(read.unpack("C*"))
+          LOG.debug "header: #{read.inspect}\n"
+          raise "BAD SIZE" unless read.length == HEADER_SIZE
           raise "Short read for DB response header: expected #{HEADER_SIZE} bytes, saw #{@buf.size}" unless @buf.size == HEADER_SIZE
           @buf.rewind
           @size = @buf.get_int

data/lib/mongo/mongo.rb

@@ -34,7 +34,7 @@ module XGen
         # and :right. Each key maps to either
         # * a server name, in which case port is DEFAULT_PORT
         # * a port number, in which case server is "localhost"
-        # * an array containing a server name and a port number in either order
+        # * an array containing a server name and a port number in that order
         #
         # +options+ are passed on to each DB instance:
         #
@@ -127,8 +127,8 @@ module XGen
 
         protected
 
-        # Turns an array containing an optional host name string and an
-        # optional port number integer into a [host, port] pair array.
+        # Turns an array containing a host name string and a
+        # port number integer into a [host, port] pair array.
         def pair_val_to_connection(a)
           case a
           when nil
@@ -138,12 +138,7 @@ module XGen
           when Integer
             ['localhost', a]
           when Array
-            connection = ['localhost', DEFAULT_PORT]
-            connection[0] = a[0] if a[0].kind_of?(String)
-            connection[0] = a[1] if a[1].kind_of?(String)
-            connection[1] = a[0] if a[0].kind_of?(Integer)
-            connection[1] = a[1] if a[1].kind_of?(Integer)
-            connection
+            a
           end
         end
 

data/lib/mongo/query.rb

@@ -16,6 +16,7 @@
 
 require 'mongo/collection'
 require 'mongo/message'
+require 'mongo/types/code'
 
 module XGen
   module Mongo
@@ -70,14 +71,16 @@ module XGen
           self.fields = return_fields
         end
 
-        # Set query selector hash. If sel is a string, it will be used as a
+        # Set query selector hash. If sel is Code/string, it will be used as a
         # $where clause. (See Mongo docs for details.)
         def selector=(sel)
           @selector = case sel
                       when nil
                         {}
-                      when String
+                      when Code
                         {"$where" => sel}
+                      when String
+                        {"$where" => Code.new(sel)}
                       when Hash
                         sel
                       end

data/lib/mongo/types/code.rb

@@ -0,0 +1,34 @@
+# --
+# Copyright (C) 2008-2009 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+module XGen
+  module Mongo
+    module Driver
+
+      # JavaScript code to be evaluated by MongoDB
+      class Code < String
+        # Hash mapping identifiers to their values
+        attr_accessor :scope
+
+        def initialize(code, scope={})
+          super(code)
+          @scope = scope
+        end
+
+      end
+    end
+  end
+end

data/lib/mongo/types/dbref.rb

@@ -20,11 +20,11 @@ module XGen
 
       class DBRef
 
-        attr_reader :parent, :field_name, :db, :namespace, :object_id
+        attr_reader :namespace, :object_id
 
-        def initialize(parent, field_name, db, namespace, object_id)
-          @parent, @field_name, @db, @namespace, @object_id =
-            parent, field_name, db, namespace, object_id
+        def initialize(namespace, object_id)
+          @namespace, @object_id =
+            namespace, object_id
         end
 
         def to_s

data/lib/mongo/util/bson.rb

@@ -62,9 +62,7 @@ class BSON
     buf.put_array(to_utf8(val.to_s).unpack("C*") + [0])
   end
 
-  def initialize(db=nil)
-    # db is only needed during deserialization when the data contains a DBRef
-    @db = db
+  def initialize()
     @buf = ByteBuffer.new
   end
 
@@ -72,27 +70,34 @@ class BSON
     @buf.to_a
   end
 
-  def serialize(obj)
-    raise "Document is null" unless obj
-
-    @buf.rewind
-    # put in a placeholder for the total size
-    @buf.put_int(0)
-
-    # Write key/value pairs. Always write _id first if it exists.
-    oid = obj['_id'] || obj[:_id]
-    serialize_key_value('_id', oid) if oid
-    obj.each {|k, v| serialize_key_value(k, v) unless k == '_id' || k == :_id }
-
-    serialize_eoo_element(@buf)
-    @buf.put_int(@buf.size, 0)
-    self
+  begin
+    require 'mongo/ext/cbson'
+    def serialize(obj)
+      @buf = ByteBuffer.new(CBson.serialize(obj))
+    end
+  rescue LoadError
+    def serialize(obj)
+      raise "Document is null" unless obj
+
+      @buf.rewind
+      # put in a placeholder for the total size
+      @buf.put_int(0)
+
+      # Write key/value pairs. Always write _id first if it exists.
+      oid = obj['_id'] || obj[:_id]
+      serialize_key_value('_id', oid) if oid
+      obj.each {|k, v| serialize_key_value(k, v) unless k == '_id' || k == :_id }
+
+      serialize_eoo_element(@buf)
+      @buf.put_int(@buf.size, 0)
+      self
+    end
   end
 
   def serialize_key_value(k, v)
-      type = bson_type(v, k)
+      type = bson_type(v)
       case type
-      when STRING, CODE, SYMBOL
+      when STRING, SYMBOL
         serialize_string_element(@buf, k, v, type)
       when NUMBER, NUMBER_INT
         serialize_number_element(@buf, k, v, type)
@@ -117,76 +122,92 @@ class BSON
       when UNDEFINED
         serialize_undefined_element(@buf, k)
       when CODE_W_SCOPE
-        # TODO CODE_W_SCOPE unimplemented; may be removed
-        raise "unimplemented type #{type}"
+        serialize_code_w_scope(@buf, k, v)
       else
         raise "unhandled type #{type}"
       end
   end
 
-  def deserialize(buf=nil, parent=nil)
-    # If buf is nil, use @buf, assumed to contain already-serialized BSON.
-    # This is only true during testing.
-    @buf = ByteBuffer.new(buf.to_a) if buf
-    @buf.rewind
-    @buf.get_int                # eat message size
-    doc = OrderedHash.new
-    while @buf.more?
-      type = @buf.get
-      case type
-      when STRING, CODE
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_string_data(@buf)
-      when SYMBOL
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_string_data(@buf).intern
-      when NUMBER
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_number_data(@buf)
-      when NUMBER_INT
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_number_int_data(@buf)
-      when OID
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_oid_data(@buf)
-      when ARRAY
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_array_data(@buf, doc)
-      when REGEX
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_regex_data(@buf)
-      when OBJECT
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_object_data(@buf, doc)
-      when BOOLEAN
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_boolean_data(@buf)
-      when DATE
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_date_data(@buf)
-      when NULL
-        key = deserialize_cstr(@buf)
-        doc[key] = nil
-      when UNDEFINED
-        key = deserialize_cstr(@buf)
-        doc[key] = Undefined.new
-      when REF
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_dbref_data(@buf, key, parent)
-      when BINARY
-        key = deserialize_cstr(@buf)
-        doc[key] = deserialize_binary_data(@buf)
-      when CODE_W_SCOPE
-        # TODO CODE_W_SCOPE unimplemented; may be removed
-        raise "unimplemented type #{type}"
-      when EOO
-        break
+  begin
+    require 'mongo/ext/cbson'
+    def deserialize(buf=nil)
+      if buf.is_a? String
+        @buf = ByteBuffer.new(buf) if buf
       else
-        raise "Unknown type #{type}, key = #{key}"
+        @buf = ByteBuffer.new(buf.to_a) if buf
       end
+      @buf.rewind
+      CBson.deserialize(@buf.to_s)
+    end
+  rescue LoadError
+    def deserialize(buf=nil)
+      # If buf is nil, use @buf, assumed to contain already-serialized BSON.
+      # This is only true during testing.
+      if buf.is_a? String
+        @buf = ByteBuffer.new(buf) if buf
+      else
+        @buf = ByteBuffer.new(buf.to_a) if buf
+      end
+      @buf.rewind
+      @buf.get_int                # eat message size
+      doc = OrderedHash.new
+      while @buf.more?
+        type = @buf.get
+        case type
+        when STRING, CODE
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_string_data(@buf)
+        when SYMBOL
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_string_data(@buf).intern
+        when NUMBER
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_number_data(@buf)
+        when NUMBER_INT
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_number_int_data(@buf)
+        when OID
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_oid_data(@buf)
+        when ARRAY
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_array_data(@buf)
+        when REGEX
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_regex_data(@buf)
+        when OBJECT
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_object_data(@buf)
+        when BOOLEAN
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_boolean_data(@buf)
+        when DATE
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_date_data(@buf)
+        when NULL
+          key = deserialize_cstr(@buf)
+          doc[key] = nil
+        when UNDEFINED
+          key = deserialize_cstr(@buf)
+          doc[key] = Undefined.new
+        when REF
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_dbref_data(@buf)
+        when BINARY
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_binary_data(@buf)
+        when CODE_W_SCOPE
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_code_w_scope_data(@buf)
+        when EOO
+          break
+        else
+          raise "Unknown type #{type}, key = #{key}"
+        end
+      end
+      @buf.rewind
+      doc
     end
-    @buf.rewind
-    doc
   end
 
   # For debugging.
@@ -221,14 +242,14 @@ class BSON
     buf.get_int
   end
 
-  def deserialize_object_data(buf, parent)
+  def deserialize_object_data(buf)
     size = buf.get_int
     buf.position -= 4
-    BSON.new(@db).deserialize(buf.get(size), parent)
+    BSON.new().deserialize(buf.get(size))
   end
 
-  def deserialize_array_data(buf, parent)
-    h = deserialize_object_data(buf, parent)
+  def deserialize_array_data(buf)
+    h = deserialize_object_data(buf)
     a = []
     h.each { |k, v| a[k.to_i] = v }
     a
@@ -248,21 +269,42 @@ class BSON
   def deserialize_string_data(buf)
     len = buf.get_int
     bytes = buf.get(len)
-    str = bytes[0..-2].pack("C*")
+    str = bytes[0..-2]
+    if str.respond_to? "pack"
+      str = str.pack("C*")
+    end
     if RUBY_VERSION >= '1.9'
       str.force_encoding("utf-8")
     end
     str
   end
 
+  def deserialize_code_w_scope_data(buf)
+    buf.get_int
+    len = buf.get_int
+    code = buf.get(len)[0..-2]
+    if code.respond_to? "pack"
+      code = code.pack("C*")
+    end
+    if RUBY_VERSION >= '1.9'
+      code.force_encoding("utf-8")
+    end
+
+    scope_size = buf.get_int
+    buf.position -= 4
+    scope = BSON.new().deserialize(buf.get(scope_size))
+
+    Code.new(code, scope)
+  end
+
   def deserialize_oid_data(buf)
     ObjectID.new(buf.get(12))
   end
 
-  def deserialize_dbref_data(buf, key, parent)
+  def deserialize_dbref_data(buf)
     ns = deserialize_string_data(buf)
     oid = deserialize_oid_data(buf)
-    DBRef.new(parent, key, @db, ns, oid)
+    DBRef.new(ns, oid)
   end
 
   def deserialize_binary_data(buf)
@@ -391,6 +433,23 @@ class BSON
     buf.position = end_pos
   end
 
+  def serialize_code_w_scope(buf, key, val)
+    buf.put(CODE_W_SCOPE)
+    self.class.serialize_cstr(buf, key)
+
+    # Make a hole for the length
+    len_pos = buf.position
+    buf.put_int(0)
+
+    buf.put_int(val.length + 1)
+    self.class.serialize_cstr(buf, val)
+    buf.put_array(BSON.new.serialize(val.scope).to_a)
+
+    end_pos = buf.position
+    buf.put_int(end_pos - len_pos, len_pos)
+    buf.position = end_pos
+  end
+
   def deserialize_cstr(buf)
     chars = ""
     while true
@@ -404,7 +463,7 @@ class BSON
     chars
   end
 
-  def bson_type(o, key)
+  def bson_type(o)
     case o
     when nil
       NULL
@@ -414,9 +473,10 @@ class BSON
       NUMBER
     when ByteBuffer
       BINARY
+    when Code
+      CODE_W_SCOPE
     when String
-      # magic awful stuff - the DB requires that a where clause is sent as CODE
-      key == "$where" ? CODE : STRING
+      STRING
     when Array
       ARRAY
     when Regexp

data/lib/mongo/util/byte_buffer.rb

@@ -100,7 +100,11 @@ class ByteBuffer
     if one_byte
       @buf[start]
     else
-      @buf[start, len]
+      if @buf.respond_to? "unpack"
+        @buf[start, len].unpack("C*")
+      else
+        @buf[start, len]
+      end
     end
   end
 
@@ -135,11 +139,19 @@ class ByteBuffer
   end
 
   def to_a
-    @buf
+    if @buf.respond_to? "unpack"
+      @buf.unpack("C*")
+    else
+      @buf
+    end
   end
 
   def to_s
-    @buf.pack("C*")
+    if @buf.respond_to? "pack"
+      @buf.pack("C*")
+    else
+      @buf
+    end
   end
 
   def dump

data/lib/mongo/util/ordered_hash.rb

@@ -35,6 +35,12 @@ class OrderedHash < Hash
     super(key, value)
   end
 
+  def ==(other)
+    !other.nil? &&
+      keys == other.keys &&
+      values == other.values
+  end
+
   def each
     @ordered_keys ||= []
     @ordered_keys.each { |k| yield k, self[k] }

data/lib/mongo/util/xml_to_ruby.rb

@@ -42,8 +42,10 @@ class XMLToRuby
       e.text.to_i
     when 'number'
       e.text.to_f
-    when 'string', 'code'
+    when 'string'
       e.text.to_s
+    when 'code'
+      Code.new(e.text.to_s)
     when 'binary'
       bin = Binary.new
       decoded = Base64.decode64(e.text.to_s)
@@ -99,7 +101,7 @@ class XMLToRuby
   def dbref_to_ruby(elements)
     ns = elements['ns'].text
     oid_str = elements['oid'].text
-    DBRef.new(nil, nil, nil, ns, ObjectID.from_string(oid_str))
+    DBRef.new(ns, ObjectID.from_string(oid_str))
   end
 
 end

data/mongo-ruby-driver.gemspec

@@ -35,6 +35,7 @@ PACKAGE_FILES = ['README.rdoc', 'Rakefile', 'mongo-ruby-driver.gemspec',
                  'lib/mongo/mongo.rb',
                  'lib/mongo/query.rb',
                  'lib/mongo/types/binary.rb',
+                 'lib/mongo/types/code.rb',
                  'lib/mongo/types/dbref.rb',
                  'lib/mongo/types/objectid.rb',
                  'lib/mongo/types/regexp_of_holding.rb',
@@ -74,7 +75,7 @@ TEST_FILES = ['tests/mongo-qa/_common.rb',
 
 Gem::Specification.new do |s|
   s.name = 'mongo'
-  s.version = '0.6.3'
+  s.version = '0.6.4'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Simple pure-Ruby driver for the 10gen Mongo DB'
   s.description = 'A pure-Ruby driver for the 10gen Mongo DB. For more information about Mongo, see http://www.mongodb.org.'

data/tests/test_admin.rb

@@ -33,6 +33,13 @@ class AdminTest < Test::Unit::TestCase
     assert_equal :slow_only, @admin.profiling_level
     @admin.profiling_level = :off
     assert_equal :off, @admin.profiling_level
+    @admin.profiling_level = :all
+    assert_equal :all, @admin.profiling_level
+    begin
+      @admin.profiling_level = :medium
+      fail "shouldn't be able to do this"
+    rescue
+    end
   end
 
   def test_profiling_info

data/tests/test_bson.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH[0,0] = File.join(File.dirname(__FILE__), '..', 'lib')
 require 'mongo'
+require 'mongo/util/ordered_hash'
 require 'test/unit'
 
 class BSONTest < Test::Unit::TestCase
@@ -16,14 +17,11 @@ class BSONTest < Test::Unit::TestCase
   def test_string
     doc = {'doc' => 'hello, world'}
     @b.serialize(doc)
-    assert_equal @b.to_a, [0x1b, 0x00, 0x00, 0x00, 0x02, ?d, ?o, ?c, 0x00, 0x0D,
-                           0x00, 0x00, 0x00, ?h, ?e, ?l, ?l, ?o, ","[0], " "[0],
-                           ?w, ?o, ?r, ?l, ?d, 0x00, 0x00]
     assert_equal doc, @b.deserialize
   end
 
   def test_code
-    doc = {'$where' => 'this.a.b < this.b'}
+    doc = {'$where' => Code.new('this.a.b < this.b')}
     @b.serialize(doc)
     assert_equal doc, @b.deserialize
   end
@@ -40,6 +38,16 @@ class BSONTest < Test::Unit::TestCase
     assert_equal doc, @b.deserialize
   end
 
+  def test_ordered_hash
+    doc = OrderedHash.new
+    doc["b"] = 1
+    doc["a"] = 2
+    doc["c"] = 3
+    doc["d"] = 4
+    @b.serialize(doc)
+    assert_equal doc, @b.deserialize
+  end
+
   def test_object
     doc = {'doc' => {'age' => 42, 'name' => 'Spongebob', 'shoe_size' => 9.5}}
     @b.serialize(doc)
@@ -100,7 +108,7 @@ class BSONTest < Test::Unit::TestCase
   def test_dbref
     oid = ObjectID.new
     doc = {}
-    doc['dbref'] = DBRef.new(doc, 'dbref', nil, 'namespace', oid)
+    doc['dbref'] = DBRef.new('namespace', oid)
     @b.serialize(doc)
     doc2 = @b.deserialize
     assert_equal 'namespace', doc2['dbref'].namespace

data/tests/test_cursor.rb

@@ -40,6 +40,58 @@ class CursorTest < Test::Unit::TestCase
     end
   end
 
+  def test_refill_via_get_more
+    1000.times { |i|
+      @@coll.insert('a' => i)
+    }
+
+    assert_equal 1001, @@coll.count
+    count = 0
+    @@coll.find.each { |obj|
+      count += obj['a']
+    }
+    assert_equal 1001, @@coll.count
+
+    # do the same thing again for debugging
+    assert_equal 1001, @@coll.count
+    count2 = 0
+    @@coll.find.each { |obj|
+      count2 += obj['a']
+    }
+    assert_equal 1001, @@coll.count
+
+    assert_equal count, count2
+    assert_equal 499501, count
+  end
+
+  def test_refill_via_get_more_alt_coll
+    coll = @@db.collection('test-alt-coll')
+    coll.clear
+    coll.insert('a' => 1)     # collection not created until it's used
+
+    1000.times { |i|
+      coll.insert('a' => i)
+    }
+
+    assert_equal 1001, coll.count
+    count = 0
+    coll.find.each { |obj|
+      count += obj['a']
+    }
+    assert_equal 1001, coll.count
+
+    # do the same thing again for debugging
+    assert_equal 1001, coll.count
+    count2 = 0
+    coll.find.each { |obj|
+      count2 += obj['a']
+    }
+    assert_equal 1001, coll.count
+
+    assert_equal count, count2
+    assert_equal 499501, count
+  end
+
   def test_close_after_query_sent
     begin
       cursor = @@coll.find('a' => 1)

data/tests/test_db.rb

@@ -56,7 +56,7 @@ class DBTest < Test::Unit::TestCase
     @@db = Mongo.new({:left => "this-should-fail", :right => [@@host, @@port]}).db('ruby-mongo-test')
     assert @@db.connected?
   ensure
-    @@db = Mongo.new(@@host, @@port) unless @@db.connected?
+    @@db = Mongo.new(@@host, @@port).db('ruby-mongo-test') unless @@db.connected?
     @@users = @@db.collection('system.users')
   end
 

data/tests/test_db_api.rb

@@ -233,6 +233,12 @@ class DBAPITest < Test::Unit::TestCase
     assert !@@db.collection_names.include?(@@coll_full_name)
   end
 
+  def test_other_drop
+    assert @@db.collection_names.include?(@@coll_full_name)
+    @@coll.drop
+    assert !@@db.collection_names.include?(@@coll_full_name)
+  end
+
   def test_collection_names
     names = @@db.collection_names
     assert names.length >= 1
@@ -277,6 +283,7 @@ class DBAPITest < Test::Unit::TestCase
   def test_index_information
     name = @@db.create_index(@@coll.name, 'a')
     list = @@db.index_information(@@coll.name)
+    assert_equal @@coll.index_information, list
     assert_equal 1, list.length
 
     info = list[0]
@@ -368,6 +375,37 @@ class DBAPITest < Test::Unit::TestCase
       @@db.strict = false
       @@db.drop_collection('foobar')
     end
+
+    # Now we're not in strict mode - should succeed
+    @@db.create_collection('foobar')
+    @@db.create_collection('foobar')
+    @@db.drop_collection('foobar')
+  end
+
+  def test_replace
+    assert_equal @@coll.count, 1
+    assert_equal @@coll.find_first["a"], 1
+
+    @@coll.replace({"a" => 1}, {"a" => 2})
+    assert_equal @@coll.count, 1
+    assert_equal @@coll.find_first["a"], 2
+
+    @@coll.replace({"b" => 1}, {"a" => 3})
+    assert_equal @@coll.count, 1
+    assert_equal @@coll.find_first["a"], 2
+  end
+
+  def test_repsert
+    assert_equal @@coll.count, 1
+    assert_equal @@coll.find_first["a"], 1
+
+    @@coll.repsert({"a" => 1}, {"a" => 2})
+    assert_equal @@coll.count, 1
+    assert_equal @@coll.find_first["a"], 2
+
+    @@coll.repsert({"b" => 1}, {"a" => 3})
+    assert_equal @@coll.count, 2
+    assert @@coll.find_first({"a" => 3})
   end
 
   def test_to_a
@@ -404,6 +442,15 @@ class DBAPITest < Test::Unit::TestCase
     assert_equal "#{@@db.host}:#{@@db.port}", @@db.master
   end
 
+  def test_where
+    @@coll.insert('a' => 2)
+    @@coll.insert('a' => 3)
+
+    assert_equal 3, @@coll.count
+    assert_equal 1, @@coll.find('$where' => Code.new('this.a > 2')).count
+    assert_equal 2, @@coll.find('$where' => Code.new('this.a > i', {'i' => 1})).count
+  end
+
   def test_hint
     name = @@coll.create_index('a')
     begin

data/tests/test_mongo.rb

@@ -64,7 +64,7 @@ class MongoTest < Test::Unit::TestCase
     assert_equal ['localhost', Mongo::DEFAULT_PORT], pair[0]
     assert_equal ['bar', Mongo::DEFAULT_PORT], pair[1]
 
-    db = Mongo.new({:right => [123, 'foo'], :left => 'bar'})
+    db = Mongo.new({:right => ['foo', 123], :left => 'bar'})
     pair = db.instance_variable_get('@pair')
     assert_equal 2, pair.length
     assert_equal ['bar', Mongo::DEFAULT_PORT], pair[0]

data/tests/test_ordered_hash.rb

@@ -16,6 +16,33 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal [], OrderedHash.new.keys
   end
 
+  def test_equality
+    a = OrderedHash.new
+    a['x'] = 1
+    a['y'] = 2
+
+    b = OrderedHash.new
+    b['y'] = 2
+    b['x'] = 1
+
+    c = OrderedHash.new
+    c['x'] = 1
+    c['y'] = 2
+
+    d = OrderedHash.new
+    d['x'] = 2
+    d['y'] = 3
+
+    e = OrderedHash.new
+    e['z'] = 1
+    e['y'] = 2
+
+    assert_equal a, c
+    assert_not_equal a, b
+    assert_not_equal a, d
+    assert_not_equal a, e
+  end
+
   def test_order_preserved
     assert_equal @ordered_keys, @oh.keys
   end

data/tests/test_round_trip.rb

@@ -93,9 +93,9 @@ EOS
       # Turn those BSON bytes back into a Ruby object.
       #
       # We're passing a nil db to the contructor here, but that's OK because
-      # the BSON DBFef bytes don't contain the db object in any case, and we
+      # the BSON DBRef bytes don't contain the db object in any case, and we
       # don't care what the database is.
-      obj_from_bson = BSON.new(nil).deserialize(ByteBuffer.new(bson_from_ruby))
+      obj_from_bson = BSON.new.deserialize(ByteBuffer.new(bson_from_ruby))
       assert_kind_of OrderedHash, obj_from_bson
 
       # Turn that Ruby object into BSON and compare it to the original BSON

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Jim Menard
@@ -61,6 +61,7 @@ files:
 - lib/mongo/mongo.rb
 - lib/mongo/query.rb
 - lib/mongo/types/binary.rb
+- lib/mongo/types/code.rb
 - lib/mongo/types/dbref.rb
 - lib/mongo/types/objectid.rb
 - lib/mongo/types/regexp_of_holding.rb