mongo 0.1.0 → 0.15

data/lib/mongo/types/code.rb

@@ -0,0 +1,30 @@
+# --
+# 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 Mongo
+
+  # 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

data/lib/mongo/types/dbref.rb

@@ -1,37 +1,33 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# 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
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 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
+module Mongo
 
-      class DBRef
+  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
-        end
-
-        def to_s
-          "ns: #{namespace}, id: #{object_id}"
-        end
+    def initialize(namespace, object_id)
+      @namespace, @object_id =
+        namespace, object_id
+    end
 
-      end
+    def to_s
+      "ns: #{namespace}, id: #{object_id}"
     end
+
   end
 end

data/lib/mongo/types/objectid.rb

@@ -1,129 +1,143 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# 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
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 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.
 # ++
 
 require 'mutex_m'
-require 'mongo/util/byte_buffer'
-
-module XGen
-  module Mongo
-    module Driver
-
-      # Implementation of the Babble OID. Object ids are not required by
-      # Mongo, but they make certain operations more efficient.
-      #
-      # The driver does not automatically assign ids to records that are
-      # inserted. (An upcoming feature will allow you to give an id "factory"
-      # to a database and/or a collection.)
-      # 
-      #   12 bytes
-      #   ---
-      #    0 time
-      #    1
-      #    2
-      #    3
-      #    4 machine
-      #    5
-      #    6
-      #    7 pid
-      #    8
-      #    9 inc
-      #   10
-      #   11
-      class ObjectID
-
-        MACHINE = ( val = rand(0x1000000); [val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff] )
-        PID = ( val = rand(0x10000); [val & 0xff, (val >> 8) & 0xff]; )
-
-        # The string representation of an OID is different than its internal
-        # and BSON byte representations. The BYTE_ORDER here maps
-        # internal/BSON byte position (the index in BYTE_ORDER) to the
-        # position of the two hex characters representing that byte in the
-        # string representation. For example, the 0th BSON byte corresponds to
-        # the (0-based) 7th pair of hex chars in the string.
-        BYTE_ORDER = [7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8]
-
-        LOCK = Object.new
-        LOCK.extend Mutex_m
-
-        @@index_time = Time.new.to_i
-        @@index = 0
-
-        # Given a string representation of an ObjectID, return a new ObjectID
-        # with that value.
-        def self.from_string(str)
-          data = []
-          BYTE_ORDER.each_with_index { |string_position, data_index|
-            data[data_index] = str[string_position * 2, 2].to_i(16)
-          }
-          self.new(data)
-        end
-
-        # +data+ is an array of bytes. If nil, a new id will be generated.
-        # The time +t+ is only used for testing; leave it nil.
-        def initialize(data=nil, t=nil)
-          @data = data || generate_id(t)
-        end
-
-        def eql?(other)
-          @data == other.to_a
-        end
-        alias_method :==, :eql?
-
-        def to_a
-          @data.dup
-        end
-
-        def to_s
-          str = ' ' * 24
-          BYTE_ORDER.each_with_index { |string_position, data_index|
-            str[string_position * 2, 2] = '%02x' % @data[data_index]
-          }
-          str
-        end
-
-        # (Would normally be private, but isn't so we can test it.)
-        def generate_id(t=nil)
-          t ||= Time.new.to_i
-          buf = ByteBuffer.new
-          buf.put_int(t & 0xffffffff)
-          buf.put_array(MACHINE)
-          buf.put_array(PID)
-          i = index_for_time(t)
-          buf.put(i & 0xff)
-          buf.put((i >> 8) & 0xff)
-          buf.put((i >> 16) & 0xff)
-
-          buf.rewind
-          buf.to_a.dup
-        end
-
-        # (Would normally be private, but isn't so we can test it.)
-        def index_for_time(t)
-          LOCK.mu_synchronize {
-            if t != @@index_time
-              @@index = 0
-              @@index_time = t
-            end
-            retval = @@index
-            @@index += 1
-            retval
-          }
-        end
+require 'socket'
+require 'digest/md5'
+
+module Mongo
+
+  # Representation of an ObjectId for Mongo.
+  class ObjectID
+    # This is the legacy byte ordering for Babble. Versions of the Ruby
+    # driver prior to 0.14 used this byte ordering when converting ObjectID
+    # instances to and from strings. If you have string representations of
+    # ObjectIDs using the legacy byte ordering make sure to use the
+    # to_s_legacy and from_string_legacy methods, or convert your strings
+    # with ObjectID#legacy_string_convert
+    BYTE_ORDER = [7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8]
+
+    LOCK = Object.new
+    LOCK.extend Mutex_m
+
+    @@index = 0
+
+    def self.legal?(str)
+      len = BYTE_ORDER.length * 2
+      str =~ /([0-9a-f]+)/i
+      match = $1
+      str && str.length == len && match == str
+    end
+
+    # +data+ is an array of bytes. If nil, a new id will be generated.
+    def initialize(data=nil)
+      @data = data || generate
+    end
+
+    def eql?(other)
+      @data == other.instance_variable_get("@data")
+    end
+    alias_method :==, :eql?
+
+    def to_a
+      @data.dup
+    end
 
+    # Given a string representation of an ObjectID, return a new ObjectID
+    # with that value.
+    def self.from_string(str)
+      raise "illegal ObjectID format" unless legal?(str)
+      data = []
+      12.times do |i|
+        data[i] = str[i * 2, 2].to_i(16)
       end
+      self.new(data)
+    end
+
+    # Create a new ObjectID given a string representation of an ObjectID
+    # using the legacy byte ordering. This method may eventually be
+    # removed. If you are not sure that you need this method you should be
+    # using the regular from_string.
+    def self.from_string_legacy(str)
+      raise "illegal ObjectID format" unless legal?(str)
+      data = []
+      BYTE_ORDER.each_with_index { |string_position, data_index|
+        data[data_index] = str[string_position * 2, 2].to_i(16)
+      }
+      self.new(data)
+    end
+
+    def to_s
+      str = ' ' * 24
+      12.times do |i|
+        str[i * 2, 2] = '%02x' % @data[i]
+      end
+      str
+    end
+
+    def inspect; to_s; end
+
+    # Get a string representation of this ObjectID using the legacy byte
+    # ordering. This method may eventually be removed. If you are not sure
+    # that you need this method you should be using the regular to_s.
+    def to_s_legacy
+      str = ' ' * 24
+      BYTE_ORDER.each_with_index { |string_position, data_index|
+        str[string_position * 2, 2] = '%02x' % @data[data_index]
+      }
+      str
+    end
+
+    # Convert a string representation of an ObjectID using the legacy byte
+    # ordering to the proper byte ordering. This method may eventually be
+    # removed. If you are not sure that you need this method it is probably
+    # unnecessary.
+    def self.legacy_string_convert(str)
+      legacy = ' ' * 24
+      BYTE_ORDER.each_with_index do |legacy_pos, pos|
+        legacy[legacy_pos * 2, 2] = str[pos * 2, 2]
+      end
+      legacy
+    end
+
+    private
+
+    def generate
+      oid = ''
+
+      # 4 bytes current time
+      time = Time.new.to_i
+      oid += [time].pack("N")
+
+      # 3 bytes machine
+      oid += Digest::MD5.digest(Socket.gethostname)[0, 3]
+
+      # 2 bytes pid
+      oid += [Process.pid % 0xFFFF].pack("n")
+
+      # 3 bytes inc
+      oid += [get_inc].pack("N")[1, 3]
+
+      oid.unpack("C12")
+    end
+
+    def get_inc
+      LOCK.mu_synchronize {
+        @@index = (@@index + 1) % 0xFFFFFF
+      }
     end
   end
 end

data/lib/mongo/types/regexp_of_holding.rb

@@ -1,44 +1,40 @@
 # --
 # Copyright (C) 2008-2009 10gen Inc.
 #
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Affero General Public License, version 3, as
-# published by the Free Software Foundation.
+# 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
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License
-# for more details.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# 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
+module Mongo
 
-      # A Regexp that can hold on to extra options and ignore them. Mongo
-      # regexes may contain option characters beyond 'i', 'm', and 'x'. (Note
-      # that Mongo only uses those three, but that regexes coming from other
-      # languages may store different option characters.)
-      #
-      # Note that you do not have to use this class at all if you wish to
-      # store regular expressions in Mongo. The Mongo and Ruby regex option
-      # flags are the same. Storing regexes is discouraged, in any case.
-      class RegexpOfHolding < Regexp
+  # A Regexp that can hold on to extra options and ignore them. Mongo
+  # regexes may contain option characters beyond 'i', 'm', and 'x'. (Note
+  # that Mongo only uses those three, but that regexes coming from other
+  # languages may store different option characters.)
+  #
+  # Note that you do not have to use this class at all if you wish to
+  # store regular expressions in Mongo. The Mongo and Ruby regex option
+  # flags are the same. Storing regexes is discouraged, in any case.
+  class RegexpOfHolding < Regexp
 
-        attr_accessor :extra_options_str
-
-        # +str+ and +options+ are the same as Regexp. +extra_options_str+
-        # contains all the other flags that were in Mongo but we do not use or
-        # understand.
-        def initialize(str, options, extra_options_str)
-          super(str, options)
-          @extra_options_str = extra_options_str
-        end
-      end
+    attr_accessor :extra_options_str
 
+    # +str+ and +options+ are the same as Regexp. +extra_options_str+
+    # contains all the other flags that were in Mongo but we do not use or
+    # understand.
+    def initialize(str, options, extra_options_str)
+      super(str, options)
+      @extra_options_str = extra_options_str
     end
   end
+
 end

data/lib/mongo/util/bson.rb

@@ -21,11 +21,12 @@ require 'mongo/types/binary'
 require 'mongo/types/dbref'
 require 'mongo/types/objectid'
 require 'mongo/types/regexp_of_holding'
-require 'mongo/types/undefined'
 
 # A BSON seralizer/deserializer.
 class BSON
 
+  include Mongo
+
   MINKEY = -1
   EOO = 0
   NUMBER = 1
@@ -44,6 +45,8 @@ class BSON
   SYMBOL = 14
   CODE_W_SCOPE = 15
   NUMBER_INT = 16
+  TIMESTAMP = 17
+  NUMBER_LONG = 18
   MAXKEY = 127
 
   if RUBY_VERSION >= '1.9'
@@ -52,7 +55,7 @@ class BSON
     end
   else
     def self.to_utf8(str)
-      str                       # TODO punt for now
+      str                       # TODO Ruby 1.8 punt for now
     end
   end
 
@@ -60,9 +63,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
 
@@ -70,115 +71,164 @@ 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)
-
-    obj.each {|k, v|
-      type = bson_type(v, k)
-      case type
-      when STRING, CODE, SYMBOL
-        serialize_string_element(@buf, k, v, type)
-      when NUMBER, NUMBER_INT
-        serialize_number_element(@buf, k, v, type)
-      when OBJECT
-        serialize_object_element(@buf, k, v)
-      when OID
-        serialize_oid_element(@buf, k, v)
-      when ARRAY
-        serialize_array_element(@buf, k, v)
-      when REGEX
-        serialize_regex_element(@buf, k, v)
-      when BOOLEAN
-        serialize_boolean_element(@buf, k, v)
-      when DATE
-        serialize_date_element(@buf, k, v)
-      when NULL
-        serialize_null_element(@buf, k)
-      when REF
-        serialize_dbref_element(@buf, k, v)
-      when BINARY
-        serialize_binary_element(@buf, k, v)
-      when UNDEFINED
-        serialize_undefined_element(@buf, k)
-      when CODE_W_SCOPE
-        # TODO
-        raise "unimplemented type #{type}"
+  begin
+    require 'mongo_ext/cbson'
+    def serialize(obj, check_keys=false)
+      @buf = ByteBuffer.new(CBson.serialize(obj, check_keys))
+    end
+  rescue LoadError
+    def serialize(obj, check_keys=false)
+      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.
+      if obj.has_key? '_id'
+        serialize_key_value('_id', obj['_id'], check_keys)
+      elsif obj.has_key? :_id
+        serialize_key_value('_id', obj[:_id], check_keys)
+      end
+
+      obj.each {|k, v| serialize_key_value(k, v, check_keys) unless k == '_id' || k == :_id }
+
+      serialize_eoo_element(@buf)
+      @buf.put_int(@buf.size, 0)
+      self
+    end
+  end
+
+  def serialize_key_value(k, v, check_keys)
+    k = k.to_s
+    if check_keys
+      if k[0] == ?$
+        raise InvalidName.new("key #{k} must not start with '$'")
+      end
+      if k.include? ?.
+        raise InvalidName.new("key #{k} must not contain '.'")
+      end
+    end
+    type = bson_type(v)
+    case type
+    when STRING, SYMBOL
+      serialize_string_element(@buf, k, v, type)
+    when NUMBER, NUMBER_INT
+      serialize_number_element(@buf, k, v, type)
+    when OBJECT
+      serialize_object_element(@buf, k, v, check_keys)
+    when OID
+      serialize_oid_element(@buf, k, v)
+    when ARRAY
+      serialize_array_element(@buf, k, v, check_keys)
+    when REGEX
+      serialize_regex_element(@buf, k, v)
+    when BOOLEAN
+      serialize_boolean_element(@buf, k, v)
+    when DATE
+      serialize_date_element(@buf, k, v)
+    when NULL
+      serialize_null_element(@buf, k)
+    when REF
+      serialize_dbref_element(@buf, k, v)
+    when BINARY
+      serialize_binary_element(@buf, k, v)
+    when UNDEFINED
+      serialize_null_element(@buf, k)
+    when CODE_W_SCOPE
+      serialize_code_w_scope(@buf, k, v)
+    else
+      raise "unhandled type #{type}"
+    end
+  end
+
+  begin
+    require 'mongo_ext/cbson'
+    def deserialize(buf=nil)
+      if buf.is_a? String
+        @buf = ByteBuffer.new(buf) if buf
       else
-        raise "unhandled type #{type}"
+        @buf = ByteBuffer.new(buf.to_a) if buf
       end
-    }
-    serialize_eoo_element(@buf)
-    @buf.put_int(@buf.size, 0)
-    self
-  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] = XGen::Mongo::Driver::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
-        raise "unimplemented type #{type}"
-      when EOO
-        break
+      @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
-        raise "Unknown type #{type}, key = #{key}"
+        @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 NUMBER_LONG
+          key = deserialize_cstr(@buf)
+          doc[key] = deserialize_number_long_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] = nil
+        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 TIMESTAMP
+          key = deserialize_cstr(@buf)
+          doc[key] = [deserialize_number_int_data(@buf),
+                      deserialize_number_int_data(@buf)]
+        when EOO
+          break
+        else
+          raise "Unknown type #{type}, key = #{key}"
+        end
+      end
+      @buf.rewind
+      doc
     end
-    @buf.rewind
-    doc
   end
 
   # For debugging.
@@ -197,8 +247,10 @@ class BSON
   end
 
   def deserialize_date_data(buf)
-    millisecs = buf.get_long()
-    Time.at(millisecs.to_f / 1000.0) # at() takes fractional seconds
+    unsigned = buf.get_long()
+    # see note for deserialize_number_long_data below
+    milliseconds = unsigned >= 2 ** 64 / 2 ? unsigned - 2**64 : unsigned
+    Time.at(milliseconds.to_f / 1000.0).utc # at() takes fractional seconds
   end
 
   def deserialize_boolean_data(buf)
@@ -210,17 +262,31 @@ class BSON
   end
 
   def deserialize_number_int_data(buf)
-    buf.get_int
+    # sometimes ruby makes me angry... why would the same code pack as signed
+    # but unpack as unsigned
+    unsigned = buf.get_int
+    unsigned >= 2**32 / 2 ? unsigned - 2**32 : unsigned
   end
 
-  def deserialize_object_data(buf, parent)
+  def deserialize_number_long_data(buf)
+    # same note as above applies here...
+    unsigned = buf.get_long
+    unsigned >= 2 ** 64 / 2 ? unsigned - 2**64 : unsigned
+  end
+
+  def deserialize_object_data(buf)
     size = buf.get_int
     buf.position -= 4
-    BSON.new(@db).deserialize(buf.get(size), parent)
+    object = BSON.new().deserialize(buf.get(size))
+    if object.has_key? "$ref"
+      DBRef.new(object["$ref"], object["$id"])
+    else
+      object
+    end
   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
@@ -234,35 +300,55 @@ class BSON
     options |= Regexp::MULTILINE if options_str.include?('m')
     options |= Regexp::EXTENDED if options_str.include?('x')
     options_str.gsub!(/[imx]/, '') # Now remove the three we understand
-    XGen::Mongo::Driver::RegexpOfHolding.new(str, options, options_str)
+    RegexpOfHolding.new(str, options, options_str)
   end
 
   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)
-    XGen::Mongo::Driver::ObjectID.new(buf.get(12))
+    ObjectID.new(buf.get(12))
   end
 
-  def deserialize_dbref_data(buf, key, parent)
-    ns = deserialize_cstr(buf)
+  def deserialize_dbref_data(buf)
+    ns = deserialize_string_data(buf)
     oid = deserialize_oid_data(buf)
-    XGen::Mongo::Driver::DBRef.new(parent, key, @db, ns, oid)
+    DBRef.new(ns, oid)
   end
 
   def deserialize_binary_data(buf)
     len = buf.get_int
-    bytes = buf.get(len)
-    str = ''
-    bytes.each { |c| str << c.chr }
-    str.to_mongo_binary
+    type = buf.get
+    len = buf.get_int if type == Binary::SUBTYPE_BYTES
+    Binary.new(buf.get(len), type)
   end
 
   def serialize_eoo_element(buf)
@@ -275,29 +361,29 @@ class BSON
   end
 
   def serialize_dbref_element(buf, key, val)
-    buf.put(REF)
-    self.class.serialize_cstr(buf, key)
-    self.class.serialize_cstr(buf, val.namespace)
-    buf.put_array(val.object_id.to_a)
+    oh = OrderedHash.new
+    oh['$ref'] = val.namespace
+    oh['$id'] = val.object_id
+    serialize_object_element(buf, key, oh, false)
   end
 
   def serialize_binary_element(buf, key, val)
     buf.put(BINARY)
     self.class.serialize_cstr(buf, key)
-    buf.put_int(val.length)
-    bytes = if RUBY_VERSION >= '1.9'
-              val.bytes.to_a
-            else
-              a = []
-              val.each_byte { |byte| a << byte }
-              a
-            end
-    buf.put_array(bytes)
-  end
-
-  def serialize_undefined_element(buf, key)
-    buf.put(UNDEFINED)
-    self.class.serialize_cstr(buf, key)
+
+    bytes = val.to_a
+    num_bytes = bytes.length
+    subtype = val.respond_to?(:subtype) ? val.subtype : Binary::SUBTYPE_BYTES
+    if subtype == Binary::SUBTYPE_BYTES
+      buf.put_int(num_bytes + 4)
+      buf.put(subtype)
+      buf.put_int(num_bytes)
+      buf.put_array(bytes)
+    else
+      buf.put_int(num_bytes)
+      buf.put(subtype)
+      buf.put_array(bytes)
+    end
   end
 
   def serialize_boolean_element(buf, key, val)
@@ -314,27 +400,38 @@ class BSON
   end
 
   def serialize_number_element(buf, key, val, type)
-    buf.put(type)
-    self.class.serialize_cstr(buf, key)
     if type == NUMBER
+      buf.put(type)
+      self.class.serialize_cstr(buf, key)
       buf.put_double(val)
     else
-      buf.put_int(val)
+      if val > 2**64 / 2 - 1 or val < -2**64 / 2
+        raise RangeError.new("MongoDB can only handle 8-byte ints")
+      end
+      if val > 2**32 / 2 - 1 or val < -2**32 / 2
+        buf.put(NUMBER_LONG)
+        self.class.serialize_cstr(buf, key)
+        buf.put_long(val)
+      else
+        buf.put(type)
+        self.class.serialize_cstr(buf, key)
+        buf.put_int(val)
+      end
     end
   end
 
-  def serialize_object_element(buf, key, val, opcode=OBJECT)
+  def serialize_object_element(buf, key, val, check_keys, opcode=OBJECT)
     buf.put(opcode)
     self.class.serialize_cstr(buf, key)
-    buf.put_array(BSON.new.serialize(val).to_a)
+    buf.put_array(BSON.new.serialize(val, check_keys).to_a)
   end
 
-  def serialize_array_element(buf, key, val)
+  def serialize_array_element(buf, key, val, check_keys)
     # Turn array into hash with integer indices as keys
     h = OrderedHash.new
     i = 0
     val.each { |v| h[i] = v; i += 1 }
-    serialize_object_element(buf, key, h, ARRAY)
+    serialize_object_element(buf, key, h, check_keys, ARRAY)
   end
 
   def serialize_regex_element(buf, key, val)
@@ -381,9 +478,26 @@ 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 1
+    while true
       b = buf.get
       break if b == 0
       chars << b.chr
@@ -394,7 +508,7 @@ class BSON
     chars
   end
 
-  def bson_type(o, key)
+  def bson_type(o)
     case o
     when nil
       NULL
@@ -402,18 +516,19 @@ class BSON
       NUMBER_INT
     when Numeric
       NUMBER
-    when XGen::Mongo::Driver::Binary # must be before String
+    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
       REGEX
-    when XGen::Mongo::Driver::ObjectID
+    when ObjectID
       OID
-    when XGen::Mongo::Driver::DBRef
+    when DBRef
       REF
     when true, false
       BOOLEAN
@@ -423,8 +538,6 @@ class BSON
       OBJECT
     when Symbol
       SYMBOL
-    when XGen::Mongo::Driver::Undefined
-      UNDEFINED
     else
       raise "Unknown type of object: #{o.class.name}"
     end