mongo_doc 0.6.28 → 0.6.29

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: 0.6.27 2011/03/05
+Version: 0.6.29 2011/05/17
 
 I use MongoDoc in production on my own apps, and have been using (lightly)
 MongoMapper and (heavily) Mongoid since 2009. By Summer 2010, I had come to the

data/lib/mongo_doc/document.rb

@@ -212,7 +212,7 @@ module MongoDoc
     end
 
     def before_save_callback(root)
-      self._id = ::BSON::ObjectID.new if new_record?
+      self._id = ::BSON::ObjectId.new if new_record?
     end
 
     def save_failed_callback(root)

data/lib/mongo_doc/ext/object_id.rb

@@ -1,11 +1,11 @@
 module BSON
-  class ObjectID
+  class ObjectId
     def to_bson(*args)
       self
     end
 
     def self.cast_from_string(string)
-      ObjectID.from_string(string) unless string.blank?
+      ObjectId.from_string(string) unless string.blank?
     end
   end
 end

data/lib/mongo_doc/finders.rb

@@ -6,7 +6,7 @@ module MongoDoc
       base.extend(Criteria) unless base === Criteria
     end
 
-    # Find a +Document+ based on id (+String+ or +BSON::ObjectID+)
+    # Find a +Document+ based on id (+String+ or +BSON::ObjectId+)
     #
     # <tt>Person.find('1')</tt>
     # <tt>Person.find(obj_id_1, obj_id_2)</tt>
@@ -21,7 +21,7 @@ module MongoDoc
       criteria
     end
 
-    # Find a +Document+ based on id (+String+ or +BSON::ObjectID+)
+    # Find a +Document+ based on id (+String+ or +BSON::ObjectId+)
     # or conditions
     #
     # <tt>Person.find_one('1')</tt>

data/lib/mongo_doc/references.rb

@@ -7,9 +7,9 @@ module MongoDoc
     end
 
     # Declare a reference to another +Document+. The reference can either be an
-    # +ObjectID+ reference, or a +BSON::DBRef+
+    # +ObjectId+ reference, or a +BSON::DBRef+
     #
-    # Use an +ObjectID+ reference when you have a simple reference or will be
+    # Use an +ObjectId+ reference when you have a simple reference or will be
     # referencing a single polymorphic collection. Example:
     #
     # +references :address
@@ -39,7 +39,7 @@ module MongoDoc
     private
 
     def references_by_id(klass, attr_name)
-      attr_accessor "#{attr_name}_id".to_sym, :type => ::BSON::ObjectID
+      attr_accessor "#{attr_name}_id".to_sym, :type => ::BSON::ObjectId
 
       module_eval(<<-RUBY, __FILE__, __LINE__)
         def #{attr_name}_id_with_reference=(value)       # def address_id_with_reference=(value)

data/lib/mongo_doc/references_many.rb

@@ -15,7 +15,7 @@ module MongoDoc
       else
         ids_or_strings.map do |item|
           if String === item
-            ::BSON::ObjectID.cast_from_string(item)
+            ::BSON::ObjectId.cast_from_string(item)
           else
             item
           end
@@ -48,9 +48,9 @@ module MongoDoc
     end
 
     # Declare reference to an array of +Document+s. The references can be
-    # +ObjectID+ references or a +BSON::DBRef+, but cannot be both.
+    # +ObjectId+ references or a +BSON::DBRef+, but cannot be both.
     #
-    # Use an +ObjectID+ reference when you have a simple reference or will be
+    # Use an +ObjectId+ reference when you have a simple reference or will be
     # referencing a single polymorphic collection. Example:
     #
     # +references_many :addresses

data/lib/mongo_doc/version.rb

@@ -1,3 +1,3 @@
 module MongoDoc
-  VERSION = "0.6.28"
+  VERSION = "0.6.29"
 end

data/lib/mongoid/contexts/id_conversion.rb

@@ -3,7 +3,7 @@ module Mongoid
     module IdConversion
       protected
 
-      # Convert ids from strings to +BSON::ObjectID+s
+      # Convert ids from strings to +BSON::ObjectId+s
       def strings_to_object_ids(ids)
         if Array === ids
           ids.map {|id| string_to_object_id(id) }
@@ -13,10 +13,10 @@ module Mongoid
 
       end
 
-      # Convert ids from strings to +BSON::ObjectID+s
+      # Convert ids from strings to +BSON::ObjectId+s
       def string_to_object_id(id)
         if String === id
-          ::BSON::ObjectID.from_string(id)
+          ::BSON::ObjectId.from_string(id)
         else
           id
         end

data/lib/mongoid/criterion/optional.rb

@@ -67,7 +67,7 @@ module Mongoid #:nodoc:
       #
       # Options:
       #
-      # object_id: A +String+ representation of a <tt>BSON::ObjectID</tt>
+      # object_id: A +String+ representation of a <tt>BSON::ObjectId</tt>
       #
       # Example:
       #

metadata

@@ -2,7 +2,7 @@
 name: mongo_doc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.28
+  version: 0.6.29
 platform: ruby
 authors: 
 - Les Hill
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -04:00
+date: 2011-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,71 +36,60 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bson
+  name: bson_ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.3.1
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.4
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.3.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.3.22
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.10.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 description: ODM for MongoDB
 email: leshill@gmail.com
 executables: []