No more use of BSON OrderedHash, merge into normal Hash

Gemfile

@@ -1,12 +1,12 @@
 # Use `bundle install` in order to install these gems
 # Use `bundle exec rake` in order to run the specs using the bundle
+source "http://gemcutter.org"
 
-gem "activemodel", ">= 3.0.beta2", :git => "git://github.com/rails/rails.git"
+gem "activemodel", ">= 3.0.beta2"
 gem "will_paginate", ">= 3.0.pre"
 gem "mongo", "0.20.1"
 gem "bson", "0.20.1"
+gem "bson_ext", "0.20.1"
 
 gem "rspec", "1.3.0"
 gem "mocha", "0.9.8"
-
-gem "ruby-debug"

lib/mongoid/document.rb

@@ -86,8 +86,8 @@ module InstanceMethods
       # all attributes excluding timestamps on the object.
       def ==(other)
         return false unless other.is_a?(Document)
-        attributes.except(:modified_at).except(:created_at) ==
-          other.attributes.except(:modified_at).except(:created_at)
+        raw_attributes.except(:modified_at).except(:created_at) ==
+          other.raw_attributes.except(:modified_at).except(:created_at)
       end
 
       # Delegates to ==
@@ -188,7 +188,7 @@ def raw_attributes
 
       # Reloads the +Document+ attributes from the database.
       def reload
-        @attributes = collection.find_one(:_id => id)
+        @attributes = {}.merge(collection.find_one(:_id => id))
         self.associations.each { |association_name, association| unmemoize(association_name) }; self
       end
 

lib/mongoid/factory.rb

@@ -11,7 +11,8 @@ class Factory #:nodoc:
     #
     # klass: The class to instantiate from if _type is not present.
     # attributes: The +Document+ attributes.
-    def self.build(klass, attrs)
+    def self.build(klass, attributes)
+      attrs = {}.merge(attributes)
       type = attrs["_type"]
       type ? type.constantize.instantiate(attrs) : klass.instantiate(attrs)
     end