mongo_doc 0.6.11 → 0.6.12

data/Gemfile

@@ -1,12 +1,3 @@
-source 'http://rubygems.org'
-
-gem "activesupport", ">= 3.0.0.beta4"
-gem "activemodel", ">= 3.0.0.beta4"
-gem "bson", ">= 1.0.0"
-gem "bson_ext", ">= 1.0.0"
-gem "cucumber", ">= 0.8.3"
-gem "jeweler", ">= 1.4.0"
-gem "mongo", ">= 1.0.0"
-gem "rspec", ">= 2.0.0.beta.12"
-gem "tzinfo", ">= 0.3.22"
+source :rubygems
 
+gemspec

data/Gemfile.lock

@@ -0,0 +1,69 @@
+PATH
+  remote: .
+  specs:
+    mongo_doc (0.6.11)
+      activemodel (>= 3.0.0.beta.4)
+      activesupport (>= 3.0.0.beta.4)
+      bson (>= 1.0.0)
+      bson_ext (>= 1.0.0)
+      mongo (>= 1.0.0)
+      tzinfo (>= 0.3.22)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0.beta4)
+      activesupport (= 3.0.0.beta4)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0.beta4)
+    bson (1.0.4)
+    bson_ext (1.0.4)
+    builder (2.1.2)
+    cucumber (0.8.5)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.1.4)
+      json_pure (~> 1.4.3)
+      term-ansicolor (~> 1.0.4)
+    diff-lcs (1.1.2)
+    gemcutter (0.6.1)
+    gherkin (2.1.5)
+      trollop (~> 1.16.2)
+    git (1.2.5)
+    i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.3)
+    mongo (1.0.5)
+      bson (>= 1.0.4)
+    rspec (2.0.0.beta.18)
+      rspec-core (= 2.0.0.beta.18)
+      rspec-expectations (= 2.0.0.beta.18)
+      rspec-mocks (= 2.0.0.beta.18)
+    rspec-core (2.0.0.beta.18)
+    rspec-expectations (2.0.0.beta.18)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.18)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    term-ansicolor (1.0.5)
+    trollop (1.16.2)
+    tzinfo (0.3.22)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (>= 3.0.0.beta.4)
+  activesupport (>= 3.0.0.beta.4)
+  bson (>= 1.0.0)
+  bson_ext (>= 1.0.0)
+  cucumber (>= 0.8.5)
+  jeweler (>= 1.4.0)
+  mongo (>= 1.0.0)
+  mongo_doc!
+  rspec (>= 2.0.0.beta.18)
+  tzinfo (>= 0.3.22)

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: Hurricane (0.6.11) 2010/07/17
+Version: Hurricane (0.6.12) 2010/07/23
 
 h2. Notes
 
@@ -177,6 +177,16 @@ Thanks to Sandro and Durran for some great conversations and some lovely code.
 
 Thanks to Elliot for pushing me to get Rails 3 support
 
+
+h2. Hacking on MongoDoc
+
+* Clone the project locally.
+* Use RVM, you will be happier.
+* Run: @gem install bundler --pre@
+* Run: @bundle install@
+* Make sure MongoDB is running.
+* Run the specs and features (they should all pass!): @rake spec && rake features@
+
 h2. Note on Patches/Pull Requests
 
 * Fork the project.

data/Rakefile

@@ -12,11 +12,13 @@ begin
     gem.files.include('lib/**/*.task')
     gem.add_dependency "activesupport", ">= 3.0.0.beta.4"
     gem.add_dependency "activemodel", ">=3.0.0.beta.4"
-    gem.add_dependency "mongo", ">= 1.0.0"
     gem.add_dependency "bson", ">= 1.0.0"
     gem.add_dependency "bson_ext", ">= 1.0.0"
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.12"
-    gem.add_development_dependency "cucumber", ">= 0.8.3"
+    gem.add_dependency "mongo", ">= 1.0.0"
+    gem.add_dependency "tzinfo", ">= 0.3.22"
+    gem.add_development_dependency "cucumber", ">= 0.8.5"
+    gem.add_development_dependency "jeweler", ">= 1.4.0"
+    gem.add_development_dependency "rspec", ">= 2.0.0.beta.18"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -37,12 +39,10 @@ end
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.ruby_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.ruby_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.12

data/features/polymorphic_collections.feature

@@ -0,0 +1,16 @@
+Feature: Polymorphic Collections
+
+  Background:
+    Given an empty Person document collection
+    And a Person document named 'Fry' :
+      | Name          |
+      | Philip J. Fry |
+    And a VIP document named 'Leela' :
+      | Name          | Title   |
+      | Turanga Leela | Captain |
+
+  Scenario: Subclassed documents are in the same collection
+    Given I save the document 'Fry'
+    And I save the document 'Leela'
+    When I query people with count
+    Then the query result is 2 documents

data/features/step_definitions/documents.rb

@@ -48,3 +48,7 @@ class Person
 
   timestamps!
 end
+
+class VIP < Person
+  attr_accessor :title
+end

data/features/step_definitions/finder_steps.rb

@@ -10,6 +10,6 @@ When /^I query (.+) to find_one with the (.+) of the '(.+)' document$/ do |colle
   self.finder_query = klass(collection).find_one(instance_variable_get("@#{doc_name}").send(id))
 end
 
-Then /^the query result was (\d+) documents$/ do |count|
+Then /^the query result (?:is|was) (\d+) documents$/ do |count|
   query.should == count.to_i
 end

data/lib/mongo_doc/contexts/ids.rb

@@ -1,6 +1,8 @@
 module Mongoid
   module Contexts
     module Ids
+      include IdConversion
+
       # Return documents based on an id search. Will handle if a single id has
       # been passed or mulitple ids.
       #
@@ -15,27 +17,6 @@ module Mongoid
         criteria.id(strings_to_object_ids(params))
         params.is_a?(Array) ? criteria.entries : one
       end
-
-      protected
-
-      # 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) }
-        else
-          string_to_object_id(ids)
-        end
-
-      end
-
-      # Convert ids from strings to +BSON::ObjectID+s
-      def string_to_object_id(id)
-        if String === id
-          ::BSON::ObjectID.from_string(id)
-        else
-          id
-        end
-      end
     end
   end
 end

data/lib/mongo_doc/contexts.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "mongoid/contexts/paging"
+require "mongoid/contexts/id_conversion"
 require "mongo_doc/contexts/ids"
 require "mongoid/contexts/enumerable"
 require "mongo_doc/contexts/mongo"

data/lib/mongo_doc/document.rb

@@ -1,4 +1,5 @@
 require 'mongo_doc/bson'
+require 'mongo_doc/polymorphic_collection'
 require 'mongo_doc/attributes'
 require 'mongo_doc/root'
 require 'mongo_doc/associations'
@@ -28,6 +29,7 @@ module MongoDoc
       klass.class_eval do
         include Attributes
         include Root
+        extend PolymorphicCollection
         extend Associations
         extend ClassMethods
         extend Criteria
@@ -151,10 +153,6 @@ module MongoDoc
         @collection ||= MongoDoc::Collection.new(collection_name)
       end
 
-      def collection_name
-        self.to_s.tableize.gsub('/', '.')
-      end
-
       def create(attrs = {})
         instance = new(attrs)
         instance.save(true)

data/lib/mongo_doc/polymorphic_collection.rb

@@ -0,0 +1,32 @@
+module MongoDoc
+  module PolymorphicCollection
+
+    def collection_name(name = nil)
+      @_collection_name ||= determine_collection_name(name && name.to_s)
+    end
+
+    private
+
+    def _parentclass(parentclass = nil)
+      @_parentclass ||= parentclass
+    end
+
+    def default_collection_name
+      self.to_s.tableize.gsub('/', '.')
+    end
+
+    def determine_collection_name(name)
+      name || find_collection_name
+    end
+
+    def find_collection_name
+      _parentclass.try(:collection_name) || default_collection_name
+    end
+
+    def inherited(subklass)
+      super
+      subklass.send(:_parentclass, self)
+    end
+
+  end
+end

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.11'
+  VERSION = '0.6.12'
 end
 
 require 'mongo_doc/connection'

data/lib/mongoid/contexts/id_conversion.rb

@@ -0,0 +1,26 @@
+module Mongoid
+  module Contexts
+    module IdConversion
+      protected
+
+      # 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) }
+        else
+          string_to_object_id(ids)
+        end
+
+      end
+
+      # Convert ids from strings to +BSON::ObjectID+s
+      def string_to_object_id(id)
+        if String === id
+          ::BSON::ObjectID.from_string(id)
+        else
+          id
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/criterion/optional.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
+
+require 'mongoid/contexts/id_conversion'
+
 module Mongoid #:nodoc:
   module Criterion #:nodoc:
     module Optional
+      include Mongoid::Contexts::IdConversion
+
       # Tells the criteria that the cursor that gets returned needs to be
       # cached. This is so multiple iterations don't hit the database multiple
       # times, however this is not advisable when working with large data sets
@@ -70,7 +75,8 @@ module Mongoid #:nodoc:
       #
       # Returns: <tt>self</tt>
       def id(*args)
-        (args.flatten.size > 1) ? self.in(:_id => args.flatten) : (@selector[:_id] = args.first)
+        ids = strings_to_object_ids(args.flatten)
+        (ids.size > 1) ? self.in(:_id => ids) : (@selector[:_id] = ids.first)
         self
       end
 

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.11"
+  s.version = "0.6.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-07-17}
+  s.date = %q{2010-07-23}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      ".rvmrc",
      ".watchr",
      "Gemfile",
+     "Gemfile.lock",
      "HISTORY.md",
      "LICENSE",
      "README.textile",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "features/mongodoc_base.feature",
      "features/new_record.feature",
      "features/partial_updates.feature",
+     "features/polymorphic_collections.feature",
      "features/references.feature",
      "features/removing_documents.feature",
      "features/saving_an_object.feature",
@@ -99,6 +101,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/finders.rb",
      "lib/mongo_doc/index.rb",
      "lib/mongo_doc/matchers.rb",
+     "lib/mongo_doc/polymorphic_collection.rb",
      "lib/mongo_doc/railtie.rb",
      "lib/mongo_doc/railties/config.rb",
      "lib/mongo_doc/railties/db_prepare.task",
@@ -110,6 +113,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/validations.rb",
      "lib/mongo_doc/validations/validates_embedded.rb",
      "lib/mongoid/contexts/enumerable.rb",
+     "lib/mongoid/contexts/id_conversion.rb",
      "lib/mongoid/contexts/paging.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/criterion/complex.rb",
@@ -151,6 +155,7 @@ Gem::Specification.new do |s|
      "spec/contexts/ids_spec.rb",
      "spec/contexts/mongo_spec.rb",
      "spec/contexts_spec.rb",
+     "spec/criteria/optional_spec.rb",
      "spec/criteria_spec.rb",
      "spec/cursor_spec.rb",
      "spec/database_cleaner_spec.rb",
@@ -165,6 +170,7 @@ Gem::Specification.new do |s|
      "spec/mongodb.yml",
      "spec/mongodb_pairs.yml",
      "spec/new_record_spec.rb",
+     "spec/polymorphic_collection_spec.rb",
      "spec/references_many_spec.rb",
      "spec/references_spec.rb",
      "spec/root_spec.rb",
@@ -196,6 +202,7 @@ Gem::Specification.new do |s|
      "spec/contexts/ids_spec.rb",
      "spec/contexts/mongo_spec.rb",
      "spec/contexts_spec.rb",
+     "spec/criteria/optional_spec.rb",
      "spec/criteria_spec.rb",
      "spec/cursor_spec.rb",
      "spec/database_cleaner_spec.rb",
@@ -208,6 +215,7 @@ Gem::Specification.new do |s|
      "spec/index_spec.rb",
      "spec/matchers_spec.rb",
      "spec/new_record_spec.rb",
+     "spec/polymorphic_collection_spec.rb",
      "spec/references_many_spec.rb",
      "spec/references_spec.rb",
      "spec/root_spec.rb",
@@ -227,28 +235,34 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta.4"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta.4"])
-      s.add_runtime_dependency(%q<mongo>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<bson>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.8.3"])
+      s.add_runtime_dependency(%q<mongo>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.22"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.8.5"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.18"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0.beta.4"])
       s.add_dependency(%q<activemodel>, [">= 3.0.0.beta.4"])
-      s.add_dependency(%q<mongo>, [">= 1.0.0"])
       s.add_dependency(%q<bson>, [">= 1.0.0"])
       s.add_dependency(%q<bson_ext>, [">= 1.0.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
-      s.add_dependency(%q<cucumber>, [">= 0.8.3"])
+      s.add_dependency(%q<mongo>, [">= 1.0.0"])
+      s.add_dependency(%q<tzinfo>, [">= 0.3.22"])
+      s.add_dependency(%q<cucumber>, [">= 0.8.5"])
+      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.18"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0.beta.4"])
     s.add_dependency(%q<activemodel>, [">= 3.0.0.beta.4"])
-    s.add_dependency(%q<mongo>, [">= 1.0.0"])
     s.add_dependency(%q<bson>, [">= 1.0.0"])
     s.add_dependency(%q<bson_ext>, [">= 1.0.0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
-    s.add_dependency(%q<cucumber>, [">= 0.8.3"])
+    s.add_dependency(%q<mongo>, [">= 1.0.0"])
+    s.add_dependency(%q<tzinfo>, [">= 0.3.22"])
+    s.add_dependency(%q<cucumber>, [">= 0.8.5"])
+    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.18"])
   end
 end
 

data/spec/criteria/optional_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Mongoid::Criterion::Optional do
+  class OptionalTest
+    include MongoDoc::Document
+  end
+
+  let(:criteria) { Mongoid::Criteria.new(OptionalTest) }
+  let(:id) { BSON::ObjectID.new }
+  let(:string_id) { id.to_s }
+
+  describe "#id" do
+    it "converts a string id to bson ids" do
+      criteria.id(string_id)
+      BSON::ObjectID.should === criteria.selector[:_id]
+    end
+
+    it "converts many string ids to bson ids" do
+      criteria.id(string_id, string_id)
+      criteria.selector[:_id].should have_key('$in')
+      criteria.selector[:_id]['$in'].each do |selector_id|
+        BSON::ObjectID.should === selector_id
+      end
+    end
+  end
+end

data/spec/polymorphic_collection_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe MongoDoc::PolymorphicCollection do
+
+  class BaseCollectionName
+    include MongoDoc::Document
+
+    attr_accessor :base
+  end
+
+  class SubCollectionName < BaseCollectionName
+    attr_accessor :sub
+  end
+
+  class OverriddenCollectionName < BaseCollectionName
+    collection_name :overridden
+    attr_accessor :over
+  end
+
+  class TwoSubCollectionName < OverriddenCollectionName
+    attr_accessor :two_sub
+  end
+
+  describe BaseCollectionName do
+    it "uses the default collection_name for base doc" do
+      BaseCollectionName.collection_name.should == BaseCollectionName.to_s.tableize.gsub('/', '.')
+    end
+  end
+
+  describe SubCollectionName do
+    it "uses the base's collection_name for the derived doc" do
+      SubCollectionName.collection_name.should == BaseCollectionName.to_s.tableize.gsub('/', '.')
+    end
+  end
+
+  describe OverriddenCollectionName do
+    it "sets the collection_name to the overridden name" do
+      OverriddenCollectionName.collection_name.should == 'overridden'
+    end
+  end
+
+  describe TwoSubCollectionName do
+    it "climbs the inheritance chain looking for the collection name" do
+      TwoSubCollectionName.collection_name.should == 'overridden'
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 6
-  - 11
-  version: 0.6.11
+  - 12
+  version: 0.6.12
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 -04:00
+date: 2010-07-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: bson
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -71,7 +71,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bson
+  name: bson_ext
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -87,7 +87,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongo
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -103,22 +103,20 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: tzinfo
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196475
+        hash: 63
         segments: 
-        - 2
         - 0
-        - 0
-        - beta
-        - 12
-        version: 2.0.0.beta.12
-  type: :development
+        - 3
+        - 22
+        version: 0.3.22
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -128,14 +126,48 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 53
         segments: 
         - 0
         - 8
-        - 3
-        version: 0.8.3
+        - 5
+        version: 0.8.5
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196423
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 18
+        version: 2.0.0.beta.18
+  type: :development
+  version_requirements: *id009
 description: ODM for MongoDB
 email: leshill@gmail.com
 executables: []
@@ -152,6 +184,7 @@ files:
 - .rvmrc
 - .watchr
 - Gemfile
+- Gemfile.lock
 - HISTORY.md
 - LICENSE
 - README.textile
@@ -167,6 +200,7 @@ files:
 - features/mongodoc_base.feature
 - features/new_record.feature
 - features/partial_updates.feature
+- features/polymorphic_collections.feature
 - features/references.feature
 - features/removing_documents.feature
 - features/saving_an_object.feature
@@ -228,6 +262,7 @@ files:
 - lib/mongo_doc/finders.rb
 - lib/mongo_doc/index.rb
 - lib/mongo_doc/matchers.rb
+- lib/mongo_doc/polymorphic_collection.rb
 - lib/mongo_doc/railtie.rb
 - lib/mongo_doc/railties/config.rb
 - lib/mongo_doc/railties/db_prepare.task
@@ -239,6 +274,7 @@ files:
 - lib/mongo_doc/validations.rb
 - lib/mongo_doc/validations/validates_embedded.rb
 - lib/mongoid/contexts/enumerable.rb
+- lib/mongoid/contexts/id_conversion.rb
 - lib/mongoid/contexts/paging.rb
 - lib/mongoid/criteria.rb
 - lib/mongoid/criterion/complex.rb
@@ -280,6 +316,7 @@ files:
 - spec/contexts/ids_spec.rb
 - spec/contexts/mongo_spec.rb
 - spec/contexts_spec.rb
+- spec/criteria/optional_spec.rb
 - spec/criteria_spec.rb
 - spec/cursor_spec.rb
 - spec/database_cleaner_spec.rb
@@ -294,6 +331,7 @@ files:
 - spec/mongodb.yml
 - spec/mongodb_pairs.yml
 - spec/new_record_spec.rb
+- spec/polymorphic_collection_spec.rb
 - spec/references_many_spec.rb
 - spec/references_spec.rb
 - spec/root_spec.rb
@@ -353,6 +391,7 @@ test_files:
 - spec/contexts/ids_spec.rb
 - spec/contexts/mongo_spec.rb
 - spec/contexts_spec.rb
+- spec/criteria/optional_spec.rb
 - spec/criteria_spec.rb
 - spec/cursor_spec.rb
 - spec/database_cleaner_spec.rb
@@ -365,6 +404,7 @@ test_files:
 - spec/index_spec.rb
 - spec/matchers_spec.rb
 - spec/new_record_spec.rb
+- spec/polymorphic_collection_spec.rb
 - spec/references_many_spec.rb
 - spec/references_spec.rb
 - spec/root_spec.rb