mongoid 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158b72d6477798214b724968813850224dc3657f
-  data.tar.gz: beff6994a7f9818cb6a956a1dbe682c66d1155f1
+  metadata.gz: cc6ad8c410d4ae0e13b891cef3eddfddd41a236d
+  data.tar.gz: b31dfba7b12e23a91520409662c9e73dd8452cd0
 SHA512:
-  metadata.gz: d01a18d141f3883470322bf3e713bd141003d85df34b97cdc45437819ae6ded25291b6c0846fc1a59e0a9d2e88a51da50684ead9ddd4747d405157f9324c7de4
-  data.tar.gz: 872d41a758ecdf59a503bda991cb8677982e774e7cc2509020c2ffc0953bbac559636ed2cd0bd58a07e9099b78195f5688d91748d55025231ef78de210c36f66
+  metadata.gz: a89977a8214ab3eeb419d17976d446d38ac4279300e093e357da037512380fe0812fdc7d042fe6405d4a409388a859bd1c466175d10ad18110a2840e7211e646
+  data.tar.gz: e9fb4f020f0a90fb726453858926fca07941fafdfe270e9cdb40ee697fe5daa3a68937a0b148d6067e75ef9762b134b2263a52f1eefc6c992f02bb46c0c5cde6

data/CHANGELOG.md

@@ -281,6 +281,10 @@ For instructions on upgrading to newer versions, visit
   https://github.com/mongoid/mongoid/blob/master/lib/mongoid/fields.rb#L16
   for the available mappings.
 
+* \#3580 Fields can now be reset to their default values, with the methods:
+
+    document.reset_name_to_default!
+
 * \#3513 Documents now have a `#destroy!` method that will raise a
   `Mongoid::Errors::DocumentNotDestroyed` error if a destroy callback returns
   a false value.
@@ -341,6 +345,13 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#3619 Don't validate documents that are flagged for destruction.
+  (Christopher J. Bottaro)
+
+* \#3617 Don't skip index creation on cyclic documents. (shaiker)
+
+* \#3568 Fixed missing attributes error on present localized fields.
+
 * \#3514 Fixed query cache to work on first/last calls.
 
 * \#3383/\#3495 Fix has_and_belongs_to_many eager load. (Arthur Neves)

data/README.md

@@ -1,4 +1,4 @@
-Mongoid [![Build Status](https://secure.travis-ci.org/mongoid/mongoid.png?branch=master)](http://travis-ci.org/mongoid/mongoid) [![Code Climate](https://codeclimate.com/github/mongoid/mongoid.png)](https://codeclimate.com/github/mongoid/mongoid) [![Coverage Status](https://coveralls.io/repos/mongoid/mongoid/badge.png?branch=master)](https://coveralls.io/r/mongoid/mongoid?branch=master) [![Gem Version](https://badge.fury.io/rb/mongoid.png)](http://badge.fury.io/rb/mongoid) [![Dependency Status](https://www.versioneye.com/ruby/mongoid/3.1.6/badge.png)](https://www.versioneye.com/ruby/mongoid/3.1.6)
+Mongoid [![Build Status](https://travis-ci.org/mongoid/mongoid.svg)](https://travis-ci.org/mongoid/mongoid) [![Code Climate](https://codeclimate.com/github/mongoid/mongoid.png)](https://codeclimate.com/github/mongoid/mongoid) [![Coverage Status](https://coveralls.io/repos/mongoid/mongoid/badge.png?branch=master)](https://coveralls.io/r/mongoid/mongoid?branch=master) [![Gem Version](https://badge.fury.io/rb/mongoid.png)](http://badge.fury.io/rb/mongoid) [![Dependency Status](https://www.versioneye.com/ruby/mongoid/3.1.6/badge.png)](https://www.versioneye.com/ruby/mongoid/3.1.6)
 ========
 
 Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.

data/lib/config/locales/en.yml

@@ -184,6 +184,12 @@ en:
             \_\_\_\_include Mongoid::Document\n
             \_\_\_\_store_in collection: 'artists', database: 'secondary'\n
             \_\_end\n\n"
+        invalid_storage_parent:
+          message: "Invalid store_in call on class %{klass}."
+          summary: "The :store_in macro can only be called on a base Mongoid Document"
+          resolution: "Remove the store_in call on class %{klass}, as it will use its
+            parent store configuration. Or remove the hierarchy extension for this
+            class."
         invalid_time:
           message: "'%{value}' is not a valid Time."
           summary: "Mongoid tries to serialize the values for Date, DateTime, and

data/lib/mongoid.rb

@@ -5,6 +5,7 @@ require "delegate"
 require "time"
 require "set"
 
+require "active_support"
 require "active_support/core_ext"
 require "active_support/json"
 require "active_support/inflector"

data/lib/mongoid/attributes.rb

@@ -91,7 +91,7 @@ module Mongoid
     # @since 1.0.0
     def read_attribute(name)
       normalized = database_field_name(name.to_s)
-      if attribute_missing?(name)
+      if attribute_missing?(normalized)
         raise ActiveModel::MissingAttributeError, "Missing attribute: '#{name}'."
       end
       if hash_dot_syntax?(normalized)
@@ -237,12 +237,29 @@ module Mongoid
     def attribute_missing?(name)
       selection = __selected_fields
       return false unless selection
-      (selection.values.first == 0 && selection[name.to_s] == 0) ||
-        (selection.values.first == 1 && !selection.has_key?(name.to_s))
+      field = fields[name]
+      (selection.values.first == 0 && selection_excluded?(name, selection, field)) ||
+        (selection.values.first == 1 && !selection_included?(name, selection, field))
     end
 
     private
 
+    def selection_excluded?(name, selection, field)
+      if field && field.localized?
+        selection["#{name}.#{::I18n.locale}"] == 0
+      else
+        selection[name] == 0
+      end
+    end
+
+    def selection_included?(name, selection, field)
+      if field && field.localized?
+        selection.has_key?("#{name}.#{::I18n.locale}")
+      else
+        selection.has_key?(name)
+      end
+    end
+
     # Does the string contain dot syntax for accessing hashes?
     #
     # @api private
@@ -298,6 +315,7 @@ module Mongoid
           alias #{name}_change   #{original}_change
           alias #{name}_changed? #{original}_changed?
           alias reset_#{name}!   reset_#{original}!
+          alias reset_#{name}_to_default!   reset_#{original}_to_default!
           alias #{name}_was      #{original}_was
           alias #{name}_will_change! #{original}_will_change!
           alias #{name}_before_type_cast #{original}_before_type_cast

data/lib/mongoid/changeable.rb

@@ -248,6 +248,15 @@ module Mongoid
       attributes[attr] = changed_attributes.delete(attr) if attribute_changed?(attr)
     end
 
+    def reset_attribute_to_default!(attr)
+      attr = database_field_name(attr)
+      if field = fields[attr]
+        __send__("#{attr}=", field.eval_default(self))
+      else
+        __send__("#{attr}=", nil)
+      end
+    end
+
     module ClassMethods
 
       private
@@ -270,6 +279,7 @@ module Mongoid
         create_dirty_default_change_check(name, meth)
         create_dirty_previous_value_accessor(name, meth)
         create_dirty_reset(name, meth)
+        create_dirty_reset_to_default(name, meth)
       end
 
       # Creates the dirty change accessor.
@@ -373,6 +383,23 @@ module Mongoid
           end
         end
       end
+
+      # Creates the dirty change reset to default.
+      #
+      # @example Create the reset.
+      #   Model.create_dirty_reset_to_default("name", "alias")
+      #
+      # @param [ String ] name The attribute name.
+      # @param [ String ] meth The name of the accessor.
+      #
+      # @since 3.0.0
+      def create_dirty_reset_to_default(name, meth)
+        generated_methods.module_eval do
+          re_define_method("reset_#{meth}_to_default!") do
+            reset_attribute_to_default!(name)
+          end
+        end
+      end
     end
   end
 end

data/lib/mongoid/composable.rb

@@ -26,13 +26,11 @@ module Mongoid
     # All modules that a +Document+ is composed of are defined in this
     # module, to keep the document class from getting too cluttered.
     included do
-      extend ActiveModel::Translation
       extend Findable
     end
 
-    include ActiveModel::Conversion
+    include ActiveModel::Model
     include ActiveModel::ForbiddenAttributesProtection
-    include ActiveModel::Naming
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
     include Atomic

data/lib/mongoid/contextual/memory.rb

@@ -295,7 +295,7 @@ module Mongoid
           updates["$set"].merge!(doc.atomic_updates["$set"] || {})
           doc.move_changes
         end
-        collection.find(selector).update(updates)
+        collection.find(selector).update(updates) unless updates["$set"].empty?
       end
 
       # Get the limiting value.

data/lib/mongoid/errors.rb

@@ -17,6 +17,7 @@ require "mongoid/errors/invalid_path"
 require "mongoid/errors/invalid_scope"
 require "mongoid/errors/invalid_set_polymorphic_relation"
 require "mongoid/errors/invalid_storage_options"
+require "mongoid/errors/invalid_storage_parent"
 require "mongoid/errors/invalid_time"
 require "mongoid/errors/invalid_value"
 require "mongoid/errors/inverse_not_found"

data/lib/mongoid/errors/invalid_storage_options.rb

@@ -8,7 +8,7 @@ module Mongoid
       # Create the new error.
       #
       # @example Create the new error.
-      #   InvalidStorageOptions.new(:collection_name)
+      #   InvalidStorageOptions.new(Person, invalid_option: 'name')
       #
       # @param [ Class ] klass The model class.
       # @param [ Hash, String, Symbol ] options The provided options.

data/lib/mongoid/errors/invalid_storage_parent.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # Raised when calling store_in in a sub-class of Mongoid::Document
+    class InvalidStorageParent < MongoidError
+
+      # Create the new error.
+      #
+      # @example Create the new error.
+      #    InvalidStorageParent.new(Person)
+      #
+      # @param [ Class ] klass The model class.
+      #
+      # @since 4.0.0
+      def initialize(klass)
+        super(
+          compose_message(
+            "invalid_storage_parent",
+            { klass: klass }
+          )
+        )
+      end
+    end
+  end
+end

data/lib/mongoid/query_cache.rb

@@ -112,10 +112,10 @@ module Mongoid
       def alias_query_cache_clear(*method_names)
         method_names.each do |method_name|
           class_eval <<-CODE, __FILE__, __LINE__ + 1
-              def #{method_name}_with_clear_cache(*args)
-                QueryCache.clear_cache
-                #{method_name}_without_clear_cache(*args)
-              end
+              def #{method_name}_with_clear_cache(*args)   # def upsert_with_clear_cache(*args)
+                QueryCache.clear_cache                     #   QueryCache.clear_cache
+                #{method_name}_without_clear_cache(*args)  #   upsert_without_clear_cache(*args)
+              end                                          # end
             CODE
 
           alias_method_chain method_name, :clear_cache
@@ -131,10 +131,11 @@ module Mongoid
 
       private
 
-      def with_cache
+      def with_cache(context = :cursor, &block)
         return yield unless QueryCache.enabled?
         return yield if system_collection?
-        key = cache_key
+        key = cache_key.push(context)
+
         if QueryCache.cache_table.has_key?(key)
           instrument(key) { QueryCache.cache_table[key] }
         else
@@ -182,7 +183,7 @@ module Mongoid
       #
       # @since 4.0.0
       def first_with_cache
-        with_cache do
+        with_cache(:first) do
           first_without_cache
         end
       end
@@ -190,7 +191,7 @@ module Mongoid
       private
 
       def cache_key
-        [ operation.database, operation.collection, operation.selector ]
+        [ operation.database, operation.collection, operation.selector, operation.limit, operation.skip, operation.fields ]
       end
 
       def system_collection?
@@ -232,7 +233,7 @@ module Mongoid
       private
 
       def cache_key
-        [ @database, @collection, @selector ]
+        [ @database, @collection, @selector, @options[:limit], @options[:skip], @options[:fields] ]
       end
 
       def system_collection?

data/lib/mongoid/scopable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Mongoid
 
   # This module contains behaviour for all Mongoid scoping - named scopes,
@@ -45,7 +46,7 @@ module Mongoid
       #     include Mongoid::Document
       #     field :active, type: Boolean
       #
-      #     scope :active, where(active: true)
+      #     scope :active, -> { where(active: true) }
       #   end
       #   Band.scopes
       #
@@ -127,14 +128,14 @@ module Mongoid
       #     field :active, type: Boolean
       #     field :count, type: Integer
       #
-      #     scope :active, where(active: true)
+      #     scope :active, -> { where(active: true) }
       #     scope :at_least, ->(count){ where(:count.gt => count) }
       #   end
       #
       # @param [ Symbol ] name The name of the scope.
-      # @param [ Proc, Criteria ] conditions The conditions of the scope.
+      # @param [ Proc ] conditions The conditions of the scope.
       #
-      # @raise [ Errors::InvalidScope ] If the scope is not a proc or criteria.
+      # @raise [ Errors::InvalidScope ] If the scope is not a proc.
       # @raise [ Errors::ScopeOverwrite ] If the scope name already exists.
       #
       # @since 1.0.0
@@ -321,15 +322,15 @@ module Mongoid
       #
       # @since 3.0.0
       def define_scope_method(name)
-        singleton_class.class_eval <<-SCOPE, __FILE__, __LINE__ + 1
-          def #{name}(*args)
-            scoping = _declared_scopes[:#{name}]
+        singleton_class.class_eval do
+          define_method name do |*args|
+            scoping = _declared_scopes[name]
             scope, extension = scoping[:scope][*args], scoping[:extension]
             criteria = with_default_scope.merge(scope || queryable)
             criteria.extend(extension)
             criteria
           end
-        SCOPE
+        end
       end
 
       # Process the default scope value. If one already exists, we merge the

data/lib/mongoid/sessions/options.rb

@@ -158,10 +158,14 @@ module Mongoid
 
         def method_missing(name, *args, &block)
           set_persistence_options(@target, @options)
-          @target.send(name, *args, &block)
+          ret = @target.send(name, *args, &block)
+          if Mongoid::Criteria == ret.class
+            ret.with @options
+          end
+          ret
         ensure
           set_persistence_options(@target, nil)
-         end
+        end
 
         def send(symbol, *args)
           __send__(symbol, *args)

data/lib/mongoid/sessions/validators/storage.rb

@@ -19,9 +19,8 @@ module Mongoid
         #
         # @since 3.0.0
         def validate(klass, options)
-          if !valid_keys?(options) || !valid_parent?(klass)
-            raise Errors::InvalidStorageOptions.new(klass, options)
-          end
+          valid_keys?(options) or raise Errors::InvalidStorageOptions.new(klass, options)
+          valid_parent?(klass) or raise Errors::InvalidStorageParent.new(klass)
         end
 
         private

data/lib/mongoid/tasks/database.rb

@@ -16,7 +16,7 @@ module Mongoid
       def create_indexes(models = ::Mongoid.models)
         models.each do |model|
           next if model.index_specifications.empty?
-          unless model.embedded?
+          if !model.embedded? || model.cyclic?
             model.create_indexes
             logger.info("MONGOID: Created indexes on #{model}:")
             model.index_specifications.each do |spec|

data/lib/mongoid/validatable.rb

@@ -14,7 +14,6 @@ module Mongoid
   # provide: validates_associated and validates_uniqueness_of.
   module Validatable
     extend ActiveSupport::Concern
-    include ActiveModel::Validations
 
     included do
       extend Macros

data/lib/mongoid/validatable/associated.rb

@@ -32,7 +32,7 @@ module Mongoid
         begin
           document.begin_validate
           valid = Array.wrap(value).collect do |doc|
-            if doc.nil?
+            if doc.nil? || doc.flagged_for_destroy?
               true
             else
               doc.validated? ? true : doc.valid?

data/lib/mongoid/validatable/uniqueness.rb

@@ -267,7 +267,10 @@ module Mongoid
       # @since 2.4.10
       def validate_root(document, attribute, value)
         klass = document.class
-        klass = klass.superclass while !klass.validators.include?(self)
+
+        while klass.superclass.respond_to?(:validators) && klass.superclass.validators.include?(self)
+          klass = klass.superclass
+        end
         criteria = create_criteria(klass, document, attribute, value)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "4.0.0.beta1"
+  VERSION = "4.0.0.beta2"
 end

data/spec/app/models/draft.rb

@@ -0,0 +1,9 @@
+class Draft
+  include Mongoid::Document
+
+  field :text
+
+  recursively_embeds_one
+
+  index text: 1
+end

data/spec/mongoid/attributes_spec.rb

@@ -21,6 +21,41 @@ describe Mongoid::Attributes do
         Person.create(title: "sir")
       end
 
+      context "when the attribute is localized" do
+
+        before do
+          person.update_attribute(:desc, "test")
+        end
+
+        context "when the context includes" do
+
+          context "when the attribute exists" do
+
+            let(:from_db) do
+              Person.only(:desc).first
+            end
+
+            it "does not raise an error" do
+              expect(from_db.desc).to eq("test")
+            end
+          end
+        end
+
+        context "when the context excludes" do
+
+          context "when the attribute exists" do
+
+            let(:from_db) do
+              Person.without(:pets).first
+            end
+
+            it "does not raise an error" do
+              expect(from_db.desc).to eq("test")
+            end
+          end
+        end
+      end
+
       context "when excluding with only" do
 
         let(:from_db) do

data/spec/mongoid/changeable_spec.rb

@@ -1142,6 +1142,83 @@ describe Mongoid::Changeable do
     end
   end
 
+  describe "#reset_attribute_to_default!" do
+
+    context "when a default is defined" do
+
+      context "when the document is new" do
+
+        let(:person) do
+          Person.new(pets: true)
+        end
+
+        before do
+          person.reset_pets_to_default!
+        end
+
+        it "resets to the default value" do
+          expect(person.pets).to eq(false)
+        end
+      end
+
+      context "when the document is persisted" do
+
+        let(:person) do
+          Person.create(pets: true)
+        end
+
+        before do
+          person.reset_pets_to_default!
+        end
+
+        it "resets to the default value" do
+          expect(person.pets).to eq(false)
+        end
+
+        it "flags the document dirty" do
+          expect(person).to be_pets_changed
+        end
+      end
+    end
+
+    context "when a default is not defined" do
+
+      context "when the document is new" do
+
+        let(:person) do
+          Person.new(title: "test")
+        end
+
+        before do
+          person.reset_title_to_default!
+        end
+
+        it "resets to nil" do
+          expect(person.title).to be_nil
+        end
+      end
+
+      context "when the document is persisted" do
+
+        let(:person) do
+          Person.create(title: "test")
+        end
+
+        before do
+          person.reset_title_to_default!
+        end
+
+        it "resets to nil" do
+          expect(person.title).to be_nil
+        end
+
+        it "flags the document dirty" do
+          expect(person).to be_title_changed
+        end
+      end
+    end
+  end
+
   context "when fields have been defined pre-dirty inclusion" do
 
     let(:document) do

data/spec/mongoid/contextual/atomic_spec.rb

@@ -104,7 +104,7 @@ describe Mongoid::Contextual::Atomic do
       end
 
       it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to be_nil
+        expect(smiths.reload.likes).to eq(0)
       end
     end
 
@@ -119,7 +119,7 @@ describe Mongoid::Contextual::Atomic do
       end
 
       it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to be_nil
+        expect(smiths.reload.likes).to eq(13)
       end
     end
 
@@ -134,7 +134,7 @@ describe Mongoid::Contextual::Atomic do
       end
 
       it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to be_nil
+        expect(smiths.reload.likes).to eq(10)
       end
     end
   end

data/spec/mongoid/criteria_spec.rb

@@ -3042,7 +3042,7 @@ describe Mongoid::Criteria do
     end
 
     it "executes the criteria while properly giving the hint to Mongo" do
-      expect { criteria.to_ary }.to raise_error(Moped::Errors::QueryFailure,  %r{failed with error 10113: "bad hint"})
+      expect { criteria.to_ary }.to raise_error(Moped::Errors::QueryFailure)
     end
   end
 
@@ -3057,7 +3057,7 @@ describe Mongoid::Criteria do
     end
 
     it "executes the criteria while properly giving the hint to Mongo" do
-      expect { criteria.to_ary }.to raise_error(Moped::Errors::QueryFailure,  %r{failed with error 10113: "bad hint"})
+      expect { criteria.to_ary }.to raise_error(Moped::Errors::QueryFailure)
     end
   end
 

data/spec/mongoid/query_cache_spec.rb

@@ -9,7 +9,7 @@ describe Mongoid::QueryCache do
 
   context "when querying for a single document" do
 
-    [ :first, :one ].each do |method|
+    [ :first, :one, :last ].each do |method|
 
       before do
         Band.all.send(method)
@@ -74,6 +74,40 @@ describe Mongoid::QueryCache do
           Band.all.to_a
         end
       end
+
+      context "when querying only the first" do
+        let(:game) { Game.create!(name: "2048") }
+
+        before do
+          game.ratings.where(:value.gt => 5).asc(:id).all.to_a
+        end
+
+        it "queries again" do
+          expect_query(1) do
+            game.ratings.where(:value.gt => 5).asc(:id).first
+          end
+        end
+      end
+
+      context "limiting the result" do
+        it "queries again" do
+          expect_query(1) do
+            Band.limit(2).all.to_a
+          end
+        end
+      end
+
+      context "specifying a different skip value" do
+        before do
+          Band.limit(2).skip(1).all.to_a
+        end
+
+        it "queries again" do
+          expect_query(1) do
+            Band.limit(2).skip(3).all.to_a
+          end
+        end
+      end
     end
 
     context "with different selector" do

data/spec/mongoid/sessions/options_spec.rb

@@ -34,6 +34,21 @@ describe Mongoid::Sessions::Options do
           expect(klass.persistence_options).to eq(options)
         end
       end
+
+      context "when returning a criteria" do
+
+        let(:criteria) do
+          klass.all
+        end
+
+        it "sets the options into the criteria object" do
+          expect(criteria.persistence_options).to eq(options)
+        end
+
+        it "doesnt set the options on class level" do
+          expect(Band.new.persistence_options).to be_nil
+        end
+      end
     end
   end
 

data/spec/mongoid/sessions_spec.rb

@@ -650,7 +650,7 @@ describe Mongoid::Sessions do
       it "raises an error" do
         expect {
           klass.store_in(database: :artists)
-        }.to raise_error(Mongoid::Errors::InvalidStorageOptions)
+        }.to raise_error(Mongoid::Errors::InvalidStorageParent)
       end
     end
 

data/spec/mongoid/tasks/database_spec.rb

@@ -13,7 +13,7 @@ describe "Mongoid::Tasks::Database" do
   end
 
   let(:models) do
-    [ User, Account, Address ]
+    [ User, Account, Address, Draft ]
   end
 
   describe ".create_indexes" do
@@ -69,6 +69,18 @@ describe "Mongoid::Tasks::Database" do
         indexes
       end
     end
+
+    context "when index is defined on self-embedded (cyclic) model" do
+
+      let(:klass) do
+        Draft
+      end
+
+      it "creates the indexes for the models" do
+        expect(klass).to receive(:create_indexes).once
+        indexes
+      end
+    end
   end
 
   describe ".undefined_indexes" do

data/spec/mongoid/validatable/associated_spec.rb

@@ -56,6 +56,29 @@ describe Mongoid::Validatable::AssociatedValidator do
           expect(description).to_not be_valid
         end
       end
+
+      context "when the documents are flagged for destroy" do
+
+        let(:user) do
+          User.new(name: "test")
+        end
+
+        let(:description) do
+          Description.new
+        end
+
+        before do
+          description.flagged_for_destroy = true
+          user.descriptions << description
+        end
+
+        it "does not run validation on them" do
+          expect(description).to receive(:valid?).never
+          expect(user).to be_valid
+        end
+
+      end
+
     end
   end
 
@@ -85,7 +108,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association is valid" do
 
         let(:associated) do
-          double(valid?: true)
+          double(valid?: true, flagged_for_destroy?: false)
         end
 
         before do
@@ -101,7 +124,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association is invalid" do
 
         let(:associated) do
-          double(valid?: false)
+          double(valid?: false, flagged_for_destroy?: false)
         end
 
         before do
@@ -135,7 +158,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the association has invalid documents" do
 
         let(:associated) do
-          double(valid?: false)
+          double(valid?: false, flagged_for_destroy?: false)
         end
 
         before do
@@ -151,7 +174,7 @@ describe Mongoid::Validatable::AssociatedValidator do
       context "when the assocation has all valid documents" do
 
         let(:associated) do
-          double(valid?: true)
+          double(valid?: true, flagged_for_destroy?: false)
         end
 
         before do

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -2344,18 +2344,19 @@ describe Mongoid::Validatable::UniquenessValidator do
   end
 
   context "when validation works with inheritance" do
+    class EuropeanActor < Actor
+      validates_uniqueness_of :name
+    end
 
-    before do
-      Actor.validates_uniqueness_of :name
-      Actor.create!(name: "Johnny Depp")
+    class SpanishActor < EuropeanActor
     end
 
-    after do
-      Actor.reset_callbacks(:validate)
+    before do
+      EuropeanActor.create!(name: "Antonio Banderas")
     end
 
     let!(:subclass_document_with_duplicated_name) do
-      Actress.new(name: "Johnny Depp")
+      SpanishActor.new(name: "Antonio Banderas")
     end
 
     it "should be invalid" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -142,6 +142,7 @@ files:
 - lib/mongoid/errors/invalid_scope.rb
 - lib/mongoid/errors/invalid_set_polymorphic_relation.rb
 - lib/mongoid/errors/invalid_storage_options.rb
+- lib/mongoid/errors/invalid_storage_parent.rb
 - lib/mongoid/errors/invalid_time.rb
 - lib/mongoid/errors/invalid_value.rb
 - lib/mongoid/errors/inverse_not_found.rb
@@ -398,6 +399,7 @@ files:
 - spec/app/models/doctor.rb
 - spec/app/models/dog.rb
 - spec/app/models/dokument.rb
+- spec/app/models/draft.rb
 - spec/app/models/dragon.rb
 - spec/app/models/driver.rb
 - spec/app/models/drug.rb
@@ -778,7 +780,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Elegant Persistance in Ruby for MongoDB.
@@ -839,6 +841,7 @@ test_files:
 - spec/app/models/doctor.rb
 - spec/app/models/dog.rb
 - spec/app/models/dokument.rb
+- spec/app/models/draft.rb
 - spec/app/models/dragon.rb
 - spec/app/models/driver.rb
 - spec/app/models/drug.rb