Removed Types and const lookup stuff. Moving stuff back to top level …

…as the const missing/get stuff was slow in combo with rails.

lib/mongo_mapper/support.rb

@@ -15,6 +15,34 @@ def self.from_mongo(value)
   end
 end
 
+class Binary
+  def self.to_mongo(value)
+    if value.is_a?(ByteBuffer)
+      value
+    else
+      value.nil? ? nil : ByteBuffer.new(value)
+    end
+  end
+
+  def self.from_mongo(value)
+    value
+  end
+end
+
+class Boolean
+  def self.to_mongo(value)
+    if value.is_a?(Boolean)
+      value
+    else
+      ['true', 't', '1'].include?(value.to_s.downcase)
+    end
+  end
+
+  def self.from_mongo(value)
+    !!value
+  end
+end
+
 class Date
   def self.to_mongo(value)
     date = Date.parse(value.to_s)
@@ -94,6 +122,22 @@ def self.from_mongo(value)
   end
 end
 
+class ObjectId
+  def self.to_mongo(value)
+    if value.nil?
+      nil
+    elsif value.is_a?(Mongo::ObjectID)
+      value
+    else
+      Mongo::ObjectID.from_string(value.to_s)
+    end
+  end
+
+  def self.from_mongo(value)
+    value
+  end
+end
+
 class Set
   def self.to_mongo(value)
     value.to_a

test/unit/test_support.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 
 class SupportTest < Test::Unit::TestCase
-  include MongoMapper::Types
-
   context "Array#to_mongo" do
     should "convert value to_a" do
       Array.to_mongo([1, 2, 3, 4]).should == [1, 2, 3, 4]