mongoid 2.1.7 → 2.1.8

data/README.rdoc

@@ -13,7 +13,7 @@ Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
 
 Mongoid is tested against Ruby 1.8.7, 1.9.2, 1.9.3, REE, Rubinius, and JRuby.
 
-http://travis-ci.org/mongoid/mongoid.png?branch=master&.png  {Build History}[http://travis-ci.org/mongoid/mongoid]
+https://secure.travis-ci.org/mongoid/mongoid.png?branch=master&.png  {Build History}[http://travis-ci.org/mongoid/mongoid]
 
 = Documentation
 

data/lib/config/locales/en.yml

@@ -26,7 +26,7 @@ en:
         invalid_field:
           Defining a field named %{name} is not allowed. Do not define
           fields that conflict with Mongoid internal attributes or method
-          names. Use Document#instance_methods to see what names this includes.
+          names. Use Mongoid.destructive_fields to see what names this includes.
         too_many_nested_attribute_records:
           Accepting nested attributes for %{association} is limited
           to %{limit} records.

data/lib/mongoid/attributes.rb

@@ -134,11 +134,12 @@ module Mongoid #:nodoc:
     #
     # @since 2.0.0.rc.8
     def apply_default_attributes
-      (@attributes ||= {}).tap do |h|
-        defaults.each_pair do |key, val|
-          unless h.has_key?(key)
-            h[key] = val.respond_to?(:call) ? typed_value_for(key, val.call) :
-              val.duplicable? ? val.dup : val
+      (@attributes ||= {}).tap do |attrs|
+        defaults.each do |name|
+          unless attrs.has_key?(name)
+            if field = fields[name]
+              attrs[name] = field.eval_default(self)
+            end
           end
         end
       end

data/lib/mongoid/collection.rb

@@ -8,7 +8,7 @@ module Mongoid #:nodoc
   # This class is the Mongoid wrapper to the Mongo Ruby driver's collection
   # object.
   class Collection
-    attr_reader :counter, :name
+    attr_reader :counter, :klass, :name
 
     # All write operations should delegate to the master connection. These
     # operations mimic the methods on a Mongo:Collection.
@@ -27,7 +27,7 @@ module Mongoid #:nodoc
     #
     # @return [ Cursor ] The results.
     def find(selector = {}, options = {})
-      cursor = Mongoid::Cursor.new(@klass, self, master(options).find(selector, options))
+      cursor = Mongoid::Cursor.new(klass, self, master(options).find(selector, options))
       if block_given?
         yield cursor; cursor.close
       else
@@ -105,7 +105,7 @@ module Mongoid #:nodoc
     # @return [ Master ] The master connection.
     def master(options = {})
       options.delete(:cache)
-      db = Mongoid.databases[@klass.database] || Mongoid.master
+      db = Mongoid.databases[klass.database] || Mongoid.master
       @master ||= Collections::Master.new(db, @name)
     end
 
@@ -124,7 +124,7 @@ module Mongoid #:nodoc
     #
     # @since 2.0.0
     def update(selector, document, options = {})
-      updater = Threaded.update
+      updater = Threaded.update_consumer(klass)
       if updater
         updater.consume(selector, document, options)
       else

data/lib/mongoid/collections.rb

@@ -6,11 +6,11 @@ module Mongoid #:nodoc
   module Collections
     extend ActiveSupport::Concern
 
+    delegate :collection, :db, :to => "self.class"
+
     included do
       cattr_accessor :_collection, :collection_name
       self.collection_name = self.name.collectionize
-
-      delegate :collection, :db, :to => "self.class"
     end
 
     module ClassMethods #:nodoc:

data/lib/mongoid/components.rb

@@ -41,5 +41,53 @@ module Mongoid #:nodoc
     include Mongoid::Validations
     include Mongoid::Callbacks
     include Mongoid::MultiDatabase
+
+    MODULES = [
+      Mongoid::Atomic,
+      Mongoid::Attributes,
+      Mongoid::Collections,
+      Mongoid::Copyable,
+      Mongoid::DefaultScope,
+      Mongoid::Dirty,
+      Mongoid::Extras,
+      Mongoid::Fields,
+      Mongoid::Hierarchy,
+      Mongoid::Indexes,
+      Mongoid::Inspection,
+      Mongoid::JSON,
+      Mongoid::Keys,
+      Mongoid::Matchers,
+      Mongoid::NamedScope,
+      Mongoid::NestedAttributes,
+      Mongoid::Persistence,
+      Mongoid::Relations,
+      Mongoid::Safety,
+      Mongoid::Serialization,
+      Mongoid::Sharding,
+      Mongoid::State,
+      Mongoid::Validations,
+      Mongoid::Callbacks,
+      Mongoid::MultiDatabase,
+    ]
+
+    class << self
+
+      # Get a list of methods that would be a bad idea to define as field names
+      # or override when including Mongoid::Document.
+      #
+      # @example Bad thing!
+      #   Mongoid::Components.prohibited_methods
+      #
+      # @return [ Array<Symbol> ]
+      #
+      # @since 2.1.8
+      def prohibited_methods
+        @prohibited_methods ||= MODULES.inject([]) do |methods, mod|
+          methods.tap do |mets|
+            mets << mod.instance_methods.map{ |m| m.to_sym }
+          end
+        end.flatten
+      end
+    end
   end
 end

data/lib/mongoid/config.rb

@@ -49,7 +49,6 @@ module Mongoid #:nodoc
     option :allow_dynamic_fields, :default => true
     option :autocreate_indexes, :default => false
     option :binding_defaults, :default => { :binding => false, :continue => true }
-    option :embedded_object_id, :default => true
     option :identity_map_enabled, :default => false
     option :include_root_in_json, :default => false
     option :max_retries_on_connection_failure, :default => 0
@@ -104,12 +103,7 @@ module Mongoid #:nodoc
     #
     # @return [ Array<String> ] An array of bad field names.
     def destructive_fields
-      @destructive_fields ||= lambda {
-        klass = Class.new do
-          include Mongoid::Document
-        end
-        klass.instance_methods(true).collect { |method| method.to_s }
-      }.call
+      Components.prohibited_methods
     end
 
     # Configure mongoid from a hash. This is usually called after parsing a

data/lib/mongoid/contexts/enumerable.rb

@@ -251,6 +251,14 @@ module Mongoid #:nodoc:
         documents
       end
 
+      def root
+        @root ||= documents.first.try(:_root)
+      end
+
+      def root_class
+        @root_class ||= root ? root.class : nil
+      end
+
       # Set the collection to the collection of the root document.
       #
       # @example Set the collection.
@@ -258,7 +266,6 @@ module Mongoid #:nodoc:
       #
       # @return [ Collection ] The root collection.
       def set_collection
-        root = documents.first.try(:_root)
         @collection = root.collection if root && !root.embedded?
       end
 

data/lib/mongoid/extras.rb

@@ -5,10 +5,11 @@ module Mongoid #:nodoc:
   module Extras
     extend ActiveSupport::Concern
 
+    delegate :cached?, :to => "self.class"
+
     included do
       class_attribute :cached
       self.cached = false
-      delegate :cached?, :to => "self.class"
     end
 
     module ClassMethods #:nodoc

data/lib/mongoid/fields.rb

@@ -13,6 +13,7 @@ require "mongoid/fields/serializable/hash"
 require "mongoid/fields/serializable/integer"
 require "mongoid/fields/serializable/bignum"
 require "mongoid/fields/serializable/fixnum"
+require "mongoid/fields/serializable/nil_class"
 require "mongoid/fields/serializable/object"
 require "mongoid/fields/serializable/object_id"
 require "mongoid/fields/serializable/range"
@@ -30,11 +31,9 @@ module Mongoid #:nodoc
   module Fields
     extend ActiveSupport::Concern
 
-    included do
-      # Set up the class attributes that must be available to all subclasses.
-      # These include defaults, fields
-      delegate :defaults, :fields, :to => "self.class"
+    delegate :defaults, :fields, :to => "self.class"
 
+    included do
       field(:_type, :type => String)
       field(:_id, :type => BSON::ObjectId)
 
@@ -88,13 +87,19 @@ module Mongoid #:nodoc
       #
       # @return [ Hash ] The field defaults.
       def defaults
-        @defaults ||= {}.tap do |defs|
-          fields.each_pair do |field_name, field|
-            unless (default = field.default).nil?
-              defs[field_name.to_s] = default
-            end
-          end
-        end
+        @defaults ||= []
+      end
+
+      # Set the defaults for the class.
+      #
+      # @example Set the defaults.
+      #   Person.defaults = defaults
+      #
+      # @param [ Array ] defaults The array of defaults to set.
+      #
+      # @since 2.0.0.rc.6
+      def defaults=(defaults)
+        @defaults = defaults
       end
 
       # Defines all the fields that are accessible on the Document
@@ -113,6 +118,7 @@ module Mongoid #:nodoc
       #
       # @return [ Field ] The generated field
       def field(name, options = {})
+        check_field_name!(name)
         add_field(name.to_s, options)
       end
 
@@ -152,7 +158,7 @@ module Mongoid #:nodoc
       # @since 2.0.0.rc.6
       def inherited(subclass)
         super
-        subclass.fields = fields.dup
+        subclass.defaults, subclass.fields = defaults.dup, fields.dup
       end
 
       # Replace a field with a new type.
@@ -167,6 +173,7 @@ module Mongoid #:nodoc
       #
       # @since 2.1.0
       def replace_field(name, type)
+        defaults.delete_one(name)
         add_field(name, fields[name].options.merge(:type => type))
       end
 
@@ -180,13 +187,12 @@ module Mongoid #:nodoc
       # @param [ Symbol ] name The name of the field.
       # @param [ Hash ] options The hash of options.
       def add_field(name, options = {})
-        @defaults = nil if @defaults
-
         meth = options.delete(:as) || name
         Mappings.for(
           options[:type], options[:identity]
         ).new(name, options).tap do |field|
           fields[name] = field
+          defaults << name unless field.default.nil?
           create_accessors(name, meth, options)
           process_options(field)
 
@@ -222,6 +228,22 @@ module Mongoid #:nodoc
         end
       end
 
+      # Determine if the field name is allowed, if not raise an error.
+      #
+      # @example Check the field name.
+      #   Model.check_field_name!(:collection)
+      #
+      # @param [ Symbol ] name The field name.
+      #
+      # @raise [ Errors::InvalidField ] If the name is not allowed.
+      #
+      # @since 2.1.8
+      def check_field_name!(name)
+        if Mongoid.destructive_fields.include?(name)
+          raise Errors::InvalidField.new(name)
+        end
+      end
+
       # Create the field accessors.
       #
       # @example Generate the accessors.

data/lib/mongoid/fields/serializable.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
     module Serializable
 
       # Set readers for the instance variables.
-      attr_reader :default_value, :label, :name, :options
+      attr_reader :default, :label, :name, :options
 
       # When reading the field do we need to cast the value? This holds true when
       # times are stored or for big decimals which are stored as strings.
@@ -44,22 +44,6 @@ module Mongoid #:nodoc:
           end.include?(:deserialize)
       end
 
-      # Get the default value for the field.
-      #
-      # @example Get the default.
-      #   field.default
-      #
-      # @return [ Object ] The default value.
-      #
-      # @since 2.1.0
-      def default
-        if default_value.respond_to?(:call)
-          serialize(default_value.call)
-        else
-          serialize(default_value)
-        end
-      end
-
       # Deserialize this field from the type stored in MongoDB to the type
       # defined on the model
       #
@@ -73,6 +57,25 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def deserialize(object); object; end
 
+      # Evaluate the default value and return it. Will handle the
+      # serialization, proc calls, and duplication if necessary.
+      #
+      # @example Evaluate the default value.
+      #   field.eval_default(document)
+      #
+      # @param [ Document ] doc The document the field belongs to.
+      #
+      # @return [ Object ] The serialized default value.
+      #
+      # @since 2.1.8
+      def eval_default(doc)
+        if default.respond_to?(:call)
+          serialize(doc.instance_exec(&default))
+        else
+          serialize(default.duplicable? ? default.dup : default)
+        end
+      end
+
       # Create the new field with a name and optional additional options.
       #
       # @example Create the new field.
@@ -87,7 +90,7 @@ module Mongoid #:nodoc:
       # @since 2.1.0
       def initialize(name, options = {})
         @name, @options = name, options
-        @default_value, @label = options[:default], options[:label]
+        @default, @label = options[:default], options[:label]
       end
 
       # Serialize the object from the type defined in the model to a MongoDB

data/lib/mongoid/fields/serializable/array.rb

@@ -7,20 +7,6 @@ module Mongoid #:nodoc:
       class Array
         include Serializable
 
-        # Get the default value for the field. If the default is a proc call
-        # it, otherwise clone the array.
-        #
-        # @example Get the default.
-        #   field.default
-        #
-        # @return [ Object ] The default value.
-        #
-        # @since 2.1.0
-        def default
-          return nil unless default_value
-          default_value.respond_to?(:call) ? default_value.call : default_value.dup
-        end
-
         # Serialize the object from the type defined in the model to a MongoDB
         # compatible object to store.
         #

data/lib/mongoid/fields/serializable/foreign_keys/array.rb

@@ -8,19 +8,6 @@ module Mongoid #:nodoc:
         class Array
           include Serializable
 
-          # Get the default value for the field. If the default is a proc call
-          # it, otherwise clone the array.
-          #
-          # @example Get the default.
-          #   field.default
-          #
-          # @return [ Object ] The default value cloned.
-          #
-          # @since 2.1.0
-          def default
-            default_value.dup
-          end
-
           # Serialize the object from the type defined in the model to a MongoDB
           # compatible object to store.
           #

data/lib/mongoid/fields/serializable/hash.rb

@@ -5,20 +5,6 @@ module Mongoid #:nodoc:
       # Defines the behaviour for hash fields.
       class Hash
         include Serializable
-
-        # Get the default value for the field. If the default is a proc call
-        # it, otherwise clone the array.
-        #
-        # @example Get the default.
-        #   field.default
-        #
-        # @return [ Object ] The default value.
-        #
-        # @since 2.1.0
-        def default
-          return nil unless default_value
-          default_value.respond_to?(:call) ? default_value.call : default_value.dup
-        end
       end
     end
   end

data/lib/mongoid/fields/serializable/nil_class.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  module Fields #:nodoc:
+    module Serializable #:nodoc:
+
+      # Defines the behaviour for nil fields.
+      class NilClass
+        include Serializable
+
+        # Deserialize this field from the type stored in MongoDB to the type
+        # defined on the model
+        #
+        # @example Deserialize the field.
+        #   field.deserialize(object)
+        #
+        # @param [ Object ] object The object to cast.
+        #
+        # @return [ nil ] Always nil.
+        #
+        # @since 2.1.0
+        def deserialize(object); nil; end
+
+        # Serialize the object from the type defined in the model to a MongoDB
+        # compatible object to store.
+        #
+        # @example Serialize the field.
+        #   field.serialize(object)
+        #
+        # @param [ Object ] object The object to cast.
+        #
+        # @return [ nil ] always nil.
+        #
+        # @since 2.1.0
+        def serialize(object); nil; end
+      end
+    end
+  end
+end

data/lib/mongoid/identity.rb

@@ -48,10 +48,8 @@ module Mongoid #:nodoc:
     # @example Set the id.
     #   identity.identify
     def identify
-      if !document.embedded? || Mongoid.embedded_object_id
-        document.id = compose.join(" ").identify if document.primary_key
-        document.id = generate_id if document.id.blank?
-      end
+      document.id = compose.join(" ").identify if document.primary_key
+      document.id = generate_id if document.id.blank?
       document.id
     end
 

data/lib/mongoid/keys.rb

@@ -6,12 +6,12 @@ module Mongoid #:nodoc:
   module Keys
     extend ActiveSupport::Concern
 
+    attr_reader :identifier
+    delegate :primary_key, :using_object_ids?, :to => "self.class"
+
     included do
       cattr_accessor :primary_key, :using_object_ids
       self.using_object_ids = true
-      delegate :primary_key, :using_object_ids?, :to => "self.class"
-
-      attr_reader :identifier
     end
 
     private

data/lib/mongoid/nested_attributes.rb

@@ -5,11 +5,11 @@ module Mongoid #:nodoc:
   module NestedAttributes
     extend ActiveSupport::Concern
 
+    delegate :nested_attributes, :to => "self.class"
+
     included do
       class_attribute :nested_attributes
       self.nested_attributes = []
-
-      delegate :nested_attributes, :to => "self.class"
     end
 
     module ClassMethods #:nodoc:

data/lib/mongoid/railtie.rb

@@ -97,20 +97,6 @@ module Rails #:nodoc:
         end
       end
 
-      # This initializer warns the user that preloading models is set to false,
-      # and queries will be inconsistent in dev mode if models are using
-      # inheritance.
-      initializer "warn of preload models configuration" do |app|
-        config.after_initialize do
-          if !::Mongoid.preload_models && !Rails.configuration.cache_classes
-            puts "\nMongoid preload_models is set to false. If you are using"
-            puts "inheritance in your application model please set this to true or "
-            puts "you will experience querying inconsistencies in dev mode. Note that"
-            puts "this will severely decrease performance in dev mode only.\n\n"
-          end
-        end
-      end
-
       # Need to include the Mongoid identity map middleware.
       initializer "include the identity map" do |app|
         app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"

data/lib/mongoid/relations/embedded/atomic.rb

@@ -53,12 +53,13 @@ module Mongoid #:nodoc:
         #
         # @since 2.0.0
         def atomically(modifier, &block)
-          updater = Threaded.update ||= MODIFIERS[modifier].new
+          updater = Threaded.update_consumer(root_class) ||
+            Threaded.set_update_consumer(root_class, MODIFIERS[modifier].new)
           count_executions do
             block.call if block
           end.tap do
             if @executions.zero?
-              Threaded.update = nil
+              Threaded.set_update_consumer(root_class, nil)
               updater.execute(collection)
             end
           end

data/lib/mongoid/relations/macros.rb

@@ -7,6 +7,10 @@ module Mongoid # :nodoc:
     module Macros
       extend ActiveSupport::Concern
 
+      # Convenience methods for the instance to know about attributes that
+      # are located at the class level.
+      delegate :associations, :relations, :to => "self.class"
+
       included do
         cattr_accessor :embedded
         class_attribute :relations
@@ -21,10 +25,6 @@ module Mongoid # :nodoc:
           alias :associations :relations
           alias :embedded? :embedded
         end
-
-        # Convenience methods for the instance to know about attributes that
-        # are located at the class level.
-        delegate :associations, :relations, :to => "self.class"
       end
 
       module ClassMethods #:nodoc:

data/lib/mongoid/relations/one.rb

@@ -17,6 +17,20 @@ module Mongoid # :nodoc:
       def in_memory
         [ target ]
       end
+
+      # Since method_missing is overridden we should override this as well.
+      #
+      # @example Does the proxy respond to the method?
+      #   relation.respond_to?(:name)
+      #
+      # @param [ Symbol ] name The method name.
+      #
+      # @return [ true, false ] If the proxy responds to the method.
+      #
+      # @since 2.1.8
+      def respond_to?(name, include_private = false)
+        target.respond_to?(name, include_private) || super
+      end
     end
   end
 end

data/lib/mongoid/relations/proxy.rb

@@ -151,6 +151,18 @@ module Mongoid # :nodoc:
       def raise_unsaved(doc)
         raise Errors::UnsavedDocument.new(base, doc)
       end
+
+      # Get the class of the root document in the hierarchy.
+      #
+      # @example Get the root's class.
+      #   proxy.root_class
+      #
+      # @return [ Class ] The root class.
+      #
+      # @since 2.1.8
+      def root_class
+        @root_class ||= base._root.class
+      end
     end
   end
 end

data/lib/mongoid/relations/referenced/in.rb

@@ -40,8 +40,8 @@ module Mongoid # :nodoc:
         def substitute(replacement)
           tap do |proxy|
             proxy.unbind_one
-            proxy.target.delete if persistable?
             return nil unless replacement
+            proxy.target.delete if persistable?
             proxy.target = replacement
             proxy.bind_one
           end

data/lib/mongoid/relations/referenced/one.rb

@@ -57,6 +57,7 @@ module Mongoid # :nodoc:
             return nil unless replacement
             proxy.target = replacement
             proxy.bind_one
+            replacement.save if persistable?
           end
         end
 

data/lib/mongoid/relations/reflections.rb

@@ -7,12 +7,9 @@ module Mongoid # :nodoc:
     module Reflections
       extend ActiveSupport::Concern
 
-      included do
-
-        delegate \
-          :reflect_on_association,
-          :reflect_on_all_associations, :to => "self.class"
-      end
+      delegate \
+        :reflect_on_association,
+        :reflect_on_all_associations, :to => "self.class"
 
       module ClassMethods #:nodoc
 

data/lib/mongoid/sharding.rb

@@ -5,11 +5,11 @@ module Mongoid #:nodoc
   module Sharding
     extend ActiveSupport::Concern
 
+    delegate :shard_key_fields, :to => "self.class"
+
     included do
       cattr_accessor :shard_key_fields
       self.shard_key_fields = []
-
-      delegate :shard_key_fields, :to => "self.class"
     end
 
     # Get the document selector with the defined shard keys.

data/lib/mongoid/threaded.rb

@@ -154,8 +154,8 @@ module Mongoid #:nodoc:
     # @return [ Object ] The atomic update consumer.
     #
     # @since 2.1.0
-    def update
-      Thread.current[:"[mongoid]:update-consumer"]
+    def update_consumer(klass)
+      Thread.current[:"[mongoid][#{klass}]:update-consumer"]
     end
 
     # Set the update consumer on the current thread.
@@ -168,8 +168,8 @@ module Mongoid #:nodoc:
     # @return [ Object ] The update consumer.
     #
     # @since 2.1.0
-    def update=(consumer)
-      Thread.current[:"[mongoid]:update-consumer"] = consumer
+    def set_update_consumer(klass, consumer)
+      Thread.current[:"[mongoid][#{klass}]:update-consumer"] = consumer
     end
   end
 end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.1.7"
+  VERSION = "2.1.8"
 end

data/lib/mongoid/versioning.rb

@@ -7,6 +7,8 @@ module Mongoid #:nodoc:
   module Versioning
     extend ActiveSupport::Concern
 
+    delegate :version_max, :to => "self.class"
+
     included do
       field :version, :type => Integer, :default => 1
 
@@ -20,7 +22,6 @@ module Mongoid #:nodoc:
       set_callback :save, :before, :revise, :if => :revisable?
 
       class_attribute :version_max
-      delegate :version_max, :to => "self.class"
       self.cyclic = true
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-08 00:00:00.000000000Z
+date: 2011-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70273131511360 !ruby/object:Gem::Requirement
+  requirement: &70188037296020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273131511360
+  version_requirements: *70188037296020
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70273131510360 !ruby/object:Gem::Requirement
+  requirement: &70188037295340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.22
   type: :runtime
   prerelease: false
-  version_requirements: *70273131510360
+  version_requirements: *70188037295340
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70273131509340 !ruby/object:Gem::Requirement
+  requirement: &70188037294640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70273131509340
+  version_requirements: *70188037294640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70273131507880 !ruby/object:Gem::Requirement
+  requirement: &70188037293900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70273131507880
+  version_requirements: *70188037293900
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70273131506780 !ruby/object:Gem::Requirement
+  requirement: &70188037293360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70273131506780
+  version_requirements: *70188037293360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70273131505780 !ruby/object:Gem::Requirement
+  requirement: &70188037292580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70273131505780
+  version_requirements: *70188037292580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70273131504680 !ruby/object:Gem::Requirement
+  requirement: &70188037291660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70273131504680
+  version_requirements: *70188037291660
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70273131503420 !ruby/object:Gem::Requirement
+  requirement: &70188037290960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70273131503420
+  version_requirements: *70188037290960
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -211,6 +211,7 @@ files:
 - lib/mongoid/fields/serializable/foreign_keys/object.rb
 - lib/mongoid/fields/serializable/hash.rb
 - lib/mongoid/fields/serializable/integer.rb
+- lib/mongoid/fields/serializable/nil_class.rb
 - lib/mongoid/fields/serializable/object.rb
 - lib/mongoid/fields/serializable/object_id.rb
 - lib/mongoid/fields/serializable/range.rb
@@ -379,7 +380,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1942003466087624126
+      hash: -2233289623287425963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: