mongoid 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b25a1415535c09fc18f98e85225d38fd4e39877
-  data.tar.gz: 7dcb8aa291c865b59a10f2a7fa1508d2ae999850
+  metadata.gz: a5340f453822e7cbecd2710795296c23db607d92
+  data.tar.gz: 0adcfd1449d91980fb45bb60aa336e661b1482f9
 SHA512:
-  metadata.gz: 6087a7ef04b49630a195f2019c575ca50abb1fd46b96739f77a8dba22a9cc3b5c5bcf49771a91785bb88a68e68c4227589b1560da18e7555e872f0c3c5776329
-  data.tar.gz: a0a0c271e5fe084d0e2360cab8f4296629907f85422a0ce4d46212b348428bc49c8eaab9a713faf4a63aebd41acca86bc0cefdfd1932c143c0d9336509c86e5e
+  metadata.gz: 9b1733f089831c0b58049cb486a8c13687f16a0845d2d9eb2acfb8c5aa0c99de3bbe3a81d6ab0bae0be9c8e4493c77864d64626b341565b5be8f7d695fb93acc
+  data.tar.gz: 1c7a4d343e583880595366b2f4afcb58a8d0f763c8a3bc5f04cea4134d1fb947f420d3ce7cb9b070902a0fd50cd03e71c1c4188c7f349a0e591774435b6a9908

data/CHANGELOG.md

@@ -3,6 +3,36 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
 
+## 4.0.3 - Not released
+
+## 4.0.2
+
+### New Features
+
+* \#3931 Add #find_or_create_by! method to many associations. (Tom Beynon)
+
+* \#3731 Add find_by! method. (Guillermo Iguaran)
+
+### Resolved Issues
+
+* \#3722 Use the right database name when combining #store_in and #with. (Arthur Neves)
+
+* \#3934 Dont apply sort when doing a find_by. (Arthur Neves)
+
+* \#3935 fix multiple fields sorting on contextual memory. (chamnap)
+
+* \#3904 BSON::Document#symbolize_keys should return keys as symbols. (Arthur Neves)
+
+* \#3948 Fix remove_undefined_indexes on rails 4.2, to symbolize right the Document keys. (Adam Wróbel)
+
+* \#3626 Document#to_key, needs to return a ObjectId as String so we can query back using that id. (Arthur Neves)
+
+* \#3888 raise UnknownAttributeError when 'set' is called on non existing field and Mongoid::Attributes::Dynamic is not included in model. (Shweta Kale)
+
+* \#3889 'set' will allow to set value of non existing field when Mongoid::Attributes::Dynamic is included in model. (Shweta Kale)
+
+* \#3812 Fixed validation context when saving (Yaroslav Zemlyanuhin)
+
 ## 4.0.1
 
 ### Resolved Issues

data/README.md

@@ -1,5 +1,5 @@
 # Mongoid
-[![Build Status](https://travis-ci.org/mongoid/mongoid.svg)](https://travis-ci.org/mongoid/mongoid) 
+[![Build Status](https://travis-ci.org/mongoid/mongoid.svg?branch=master)](https://travis-ci.org/mongoid/mongoid) 
 [![Code Climate](https://codeclimate.com/github/mongoid/mongoid.svg)](https://codeclimate.com/github/mongoid/mongoid)
 [![Coverage Status](https://img.shields.io/coveralls/mongoid/mongoid/master.svg)](https://coveralls.io/r/mongoid/mongoid?branch=master)
 [![Dependency Status](https://www.versioneye.com/ruby/mongoid/4.0.0/badge.svg)](https://www.versioneye.com/ruby/mongoid/4.0.0)

data/lib/mongoid/contextual/memory.rb

@@ -135,6 +135,7 @@ module Mongoid
         doc
       end
       alias :one :first
+      alias :find_first :first
 
       # Create the new in memory context.
       #
@@ -421,12 +422,11 @@ module Mongoid
       #
       # @since 3.0.0
       def in_place_sort(values)
-        values.keys.reverse.each do |field|
-          documents.sort! do |a, b|
+        documents.sort! do |a, b|
+          values.map do |field, direction|
             a_value, b_value = a[field], b[field]
-            value = compare(a_value.__sortable__, b_value.__sortable__)
-            values[field] < 0 ? value * -1 : value
-          end
+            direction * compare(a_value.__sortable__, b_value.__sortable__)
+          end.find { |value| !value.zero? } || 0
         end
       end
 

data/lib/mongoid/contextual/mongo.rb

@@ -202,6 +202,16 @@ module Mongoid
       end
       alias :one :first
 
+      # Return the first result without applying sort
+      #
+      # @api private
+      #
+      # @since 4.0.2
+      def find_first
+        return documents.first if cached? && cache_loaded?
+        with_eager_loading(query.first)
+      end
+
       # Execute a $geoNear command against the database.
       #
       # @example Find documents close to 10, 10.

data/lib/mongoid/document.rb

@@ -134,11 +134,11 @@ module Mongoid
     # @example Return the key.
     #   document.to_key
     #
-    # @return [ Object ] The id of the document or nil if new.
+    # @return [ String ] The id of the document or nil if new.
     #
     # @since 2.4.0
     def to_key
-      (persisted? || destroyed?) ? [ id ] : nil
+      (persisted? || destroyed?) ? [ id.to_s ] : nil
     end
 
     # Return an array with this +Document+ only in it.

data/lib/mongoid/extensions.rb

@@ -12,6 +12,19 @@ class Symbol
   remove_method :size if instance_methods.include? :size # temporal fix for ruby 1.9
 end
 
+class BSON::Document
+  # We need to override this as ActiveSupport creates a new Object, instead of a new Hash
+  # see https://github.com/rails/rails/commit/f1bad130d0c9bd77c94e43b696adca56c46a66aa
+  def transform_keys
+    return enum_for(:transform_keys) unless block_given?
+    result = {}
+    each_key do |key|
+      result[yield(key)] = self[key]
+    end
+    result
+  end
+end
+
 require "mongoid/extensions/array"
 require "mongoid/extensions/big_decimal"
 require "mongoid/extensions/boolean"

data/lib/mongoid/findable.rb

@@ -90,21 +90,24 @@ module Mongoid
       with_default_scope.find(*args)
     end
 
-    # Find the first +Document+ given the conditions, or raises
-    # Mongoid::Errors::DocumentNotFound
+    # Find the first +Document+ given the conditions.
+    # If a matching Document is not found and
+    # Mongoid.raise_not_found_error is true it raises
+    # Mongoid::Errors::DocumentNotFound, return null nil elsewise.
     #
     # @example Find the document by attribute other than id
     #   Person.find_by(:username => "superuser")
     #
     # @param [ Hash ] attrs The attributes to check.
     #
-    # @raise [ Errors::DocumentNotFound ] If no document found.
+    # @raise [ Errors::DocumentNotFound ] If no document found
+    # and Mongoid.raise_not_found_error is true.
     #
-    # @return [ Document ] A matching document.
+    # @return [ Document, nil ] A matching document.
     #
     # @since 3.0.0
     def find_by(attrs = {})
-      result = where(attrs).first
+      result = where(attrs).find_first
       if result.nil? && Mongoid.raise_not_found_error
         raise(Errors::DocumentNotFound.new(self, attrs))
       end
@@ -112,6 +115,25 @@ module Mongoid
       result
     end
 
+    # Find the first +Document+ given the conditions, or raises
+    # Mongoid::Errors::DocumentNotFound
+    #
+    # @example Find the document by attribute other than id
+    #   Person.find_by(:username => "superuser")
+    #
+    # @param [ Hash ] attrs The attributes to check.
+    #
+    # @raise [ Errors::DocumentNotFound ] If no document found.
+    #
+    # @return [ Document ] A matching document.
+    #
+    def find_by!(attrs = {})
+      result = where(attrs).find_first
+      raise(Errors::DocumentNotFound.new(self, attrs)) unless result
+      yield(result) if result && block_given?
+      result
+    end
+
     # Find the first +Document+ given the conditions.
     #
     # @example Find the first document.

data/lib/mongoid/persistable/creatable.rb

@@ -111,7 +111,8 @@ module Mongoid
       #
       # @since 4.0.0
       def prepare_insert(options = {})
-        return self if performing_validations?(options) && invalid?(:create)
+        return self if performing_validations?(options) &&
+          invalid?(options[:context] || :create)
         result = run_callbacks(:save) do
           run_callbacks(:create) do
             yield(self)

data/lib/mongoid/persistable/settable.rb

@@ -22,7 +22,7 @@ module Mongoid
       def set(setters)
         prepare_atomic_operation do |ops|
           process_atomic_operations(setters) do |field, value|
-            send("#{field}=", value)
+            process_attribute(field.to_s, value)
             ops[atomic_attribute_name(field)] = attributes[field]
           end
           { "$set" => ops }

data/lib/mongoid/persistable/updatable.rb

@@ -110,7 +110,8 @@ module Mongoid
       #
       # @since 4.0.0
       def prepare_update(options = {})
-        return false if performing_validations?(options) && invalid?(:update)
+        return false if performing_validations?(options) &&
+          invalid?(options[:context] || :update)
         process_flagged_destroys
         result = run_callbacks(:save) do
           run_callbacks(:update) do

data/lib/mongoid/relations/many.rb

@@ -98,6 +98,27 @@ module Mongoid
         find_or(:create, attrs, type, &block)
       end
 
+      # Find the first document given the conditions, or creates a new document
+      # with the conditions that were supplied. This will raise an error if validation fails.
+      #
+      # @example Find or create.
+      #   person.posts.find_or_create_by!(:title => "Testing")
+      #
+      # @overload find_or_create_by!(attributes = nil, type = nil)
+      #   @param [ Hash ] attributes The attributes to search or create with.
+      #   @param [ Class ] type The optional type of document to create.
+      #
+      # @overload find_or_create_by!(attributes = nil, type = nil)
+      #   @param [ Hash ] attributes The attributes to search or create with.
+      #   @param [ Class ] type The optional type of document to create.
+      #
+      # @raise [ Errors::Validations ] If validation failed.
+      #
+      # @return [ Document ] An existing document or newly created one.
+      def find_or_create_by!(attrs = {}, type = nil, &block)
+        find_or(:create!, attrs, type, &block)
+      end
+
       # Find the first +Document+ given the conditions, or instantiates a new document
       # with the conditions that were supplied
       #

data/lib/mongoid/sessions/options.rb

@@ -39,8 +39,13 @@ module Mongoid
 
       def mongo_session
         if persistence_options
-          session_name = persistence_options[:session] || self.class.session_name
-          Sessions.with_name(session_name).with(persistence_options)
+          if persistence_options[:session]
+            session = Sessions.with_name(persistence_options[:session])
+          else
+            session = Sessions.with_name(self.class.session_name)
+            session.use(self.class.database_name)
+          end
+          session.with(persistence_options)
         end
       end
 

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -27,6 +27,38 @@ development:
         # The time in seconds that Moped should wait before retrying an
         # operation on failure. (default: 0.25)
         # retry_interval: 0.25
+        
+        # The connection pool size per-node.  This should match or exceed the
+        # number of threads for a multi-threaded application. (default: 5)
+        # pool_size: 5
+        
+        # The time in seconds that Moped should wait for the pool to provide
+        # an available connection.  This number should probably remain at the 
+        # default, unless for some reason you absolutely need to limit the
+        # pool_size, as this wait is only used when the pool is saturated.
+        # (default: 0.5)
+        # pool_timeout: 0.5
+
+        # The time in seconds before Moped will timeout connection and node
+        # operations. (default: 5)
+        # timeout: 5
+        
+        # The amount of time in seconds between forced refreshes of node 
+        # information including the discovery of new peers. (default: 300)
+        # refresh_interval: 300
+        
+        # The amount of time in seconds that a node will be flagged as down.
+        # (default: 30) 
+        # down_interval: 30
+        
+        # Whether connections should use SSL. (default: nil/false)
+        # ssl: false
+        
+        # Whether Moped will use the existing seeds/nodes to find other peers.
+        # (default: true)
+        # auto_discover: true
+
+
   # Configure Mongoid specific options. (optional)
   options:
     # Includes the root model name in json serialization. (default: false)

data/spec/app/models/contextable_item.rb

@@ -0,0 +1,5 @@
+class ContextableItem
+  include Mongoid::Document
+  field :title
+  validates :title, presence: true, on: :in_context
+end

data/spec/mongoid/attributes/nested_spec.rb

@@ -55,7 +55,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is an embeds one" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :name_attributes=)
         Person.accepts_nested_attributes_for :name
       end
@@ -71,7 +71,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is an embeds many" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :addresses_attributes=)
         Person.accepts_nested_attributes_for :addresses
       end
@@ -104,7 +104,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is an embedded in" do
 
-      before(:all) do
+      before do
         Video.accepts_nested_attributes_for :person
       end
 
@@ -119,7 +119,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is a references one" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :game_attributes=)
         Person.accepts_nested_attributes_for :game
       end
@@ -135,7 +135,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is a references many" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :posts_attributes=)
         Person.accepts_nested_attributes_for :posts
       end
@@ -151,7 +151,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is a references and referenced in many" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :preferences_attributes=)
         Person.accepts_nested_attributes_for :preferences
       end
@@ -167,7 +167,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when the relation is a referenced in" do
 
-      before(:all) do
+      before do
         Post.accepts_nested_attributes_for :person
       end
 
@@ -237,13 +237,13 @@ describe Mongoid::Attributes::Nested do
 
         context "when a reject proc is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :name_attributes=)
             Person.accepts_nested_attributes_for \
               :name, reject_if: ->(attrs){ attrs[:first_name].blank? }
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :name_attributes=)
             Person.accepts_nested_attributes_for :name
           end
@@ -275,13 +275,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when the relation is not autobuilding" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :name_attributes=)
               Person.accepts_nested_attributes_for \
                 :name, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :name_attributes=)
               Person.accepts_nested_attributes_for :name
             end
@@ -311,11 +311,11 @@ describe Mongoid::Attributes::Nested do
 
           context "when the relation is autobuilding" do
 
-            before(:all) do
+            before do
               Product.accepts_nested_attributes_for :seo, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Product.send(:undef_method, :seo_attributes=)
             end
 
@@ -349,12 +349,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name
               end
@@ -384,12 +384,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name
               end
@@ -433,12 +433,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -455,12 +455,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -518,12 +518,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -546,11 +546,11 @@ describe Mongoid::Attributes::Nested do
 
                     context "when the document has destroy callbacks" do
 
-                      before(:all) do
+                      before do
                         PetOwner.accepts_nested_attributes_for :pet, allow_destroy: true
                       end
 
-                      after(:all) do
+                      after do
                         PetOwner.send(:undef_method, :pet_attributes=)
                       end
 
@@ -596,12 +596,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -621,7 +621,7 @@ describe Mongoid::Attributes::Nested do
 
               context "when update only is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for \
                     :name,
@@ -629,7 +629,7 @@ describe Mongoid::Attributes::Nested do
                     allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -693,11 +693,11 @@ describe Mongoid::Attributes::Nested do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:pet)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -755,12 +755,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 end
@@ -776,12 +776,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 end
@@ -825,12 +825,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow destroy is true" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 end
@@ -868,12 +868,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 end
@@ -942,11 +942,11 @@ describe Mongoid::Attributes::Nested do
 
           context "when the nested document is invalid" do
 
-            before(:all) do
+            before do
               Person.validates_format_of :ssn, without: /\$\$\$/
             end
 
-            after(:all) do
+            after do
               Person.reset_callbacks(:validate)
             end
 
@@ -1041,12 +1041,12 @@ describe Mongoid::Attributes::Nested do
 
         context "when a limit is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :addresses_attributes=)
             Person.accepts_nested_attributes_for :addresses, limit: 2
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :addresses_attributes=)
             Person.accepts_nested_attributes_for :addresses
           end
@@ -1106,11 +1106,11 @@ describe Mongoid::Attributes::Nested do
 
           context "when cascading callbacks" do
 
-            before(:all) do
+            before do
               Band.accepts_nested_attributes_for :records
             end
 
-            after(:all) do
+            after do
               Band.send(:undef_method, :records_attributes=)
             end
 
@@ -1314,18 +1314,13 @@ describe Mongoid::Attributes::Nested do
 
                 context "when the parent validation failed" do
 
-                  before(:all) do
-                    Band.validates_presence_of :name
-                    Band.accepts_nested_attributes_for :records, :allow_destroy => true
-                  end
-
-                  after(:all) do
-                    Band.send(:undef_method, :records_attributes=)
-                    Band.reset_callbacks(:validate)
+                  class BandWithAllowDestroyedRecords < Band
+                    validates_presence_of :name
+                    accepts_nested_attributes_for :records, :allow_destroy => true
                   end
 
                   let!(:band) do
-                    Band.create(name: "Depeche Mode")
+                    BandWithAllowDestroyedRecords.create(name: "Depeche Mode")
                   end
 
                   let!(:record) do
@@ -1358,11 +1353,11 @@ describe Mongoid::Attributes::Nested do
 
                 context "when the child accesses the parent after destroy" do
 
-                  before(:all) do
+                  before do
                     Band.accepts_nested_attributes_for :records, :allow_destroy => true
                   end
 
-                  after(:all) do
+                  after do
                     Band.send(:undef_method, :records_attributes=)
                   end
 
@@ -1391,11 +1386,11 @@ describe Mongoid::Attributes::Nested do
 
                 context "when the child has defaults" do
 
-                  before(:all) do
+                  before do
                     Person.accepts_nested_attributes_for :appointments, allow_destroy: true
                   end
 
-                  after(:all) do
+                  after do
                     Person.send(:undef_method, :appointments_attributes=)
                   end
 
@@ -1470,12 +1465,12 @@ describe Mongoid::Attributes::Nested do
 
                 context "when the child is not paranoid" do
 
-                  before(:all) do
+                  before do
                     Person.send(:undef_method, :addresses_attributes=)
                     Person.accepts_nested_attributes_for :addresses, allow_destroy: true
                   end
 
-                  after(:all) do
+                  after do
                     Person.send(:undef_method, :addresses_attributes=)
                     Person.accepts_nested_attributes_for :addresses
                   end
@@ -1675,12 +1670,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :addresses_attributes=)
                   Person.accepts_nested_attributes_for :addresses, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :addresses_attributes=)
                   Person.accepts_nested_attributes_for :addresses
                 end
@@ -1737,7 +1732,7 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is undefined" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :addresses_attributes=)
                   Person.accepts_nested_attributes_for :addresses
                 end
@@ -1833,13 +1828,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when a reject block is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for \
                 :addresses, reject_if: ->(attrs){ attrs["street"].blank? }
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for :addresses
             end
@@ -1875,13 +1870,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when :reject_if => :all_blank is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for \
                 :addresses, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for :addresses
             end
@@ -1919,12 +1914,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses
               end
@@ -1980,12 +1975,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses
               end
@@ -2045,7 +2040,7 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow destroy is not defined" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses
               end
@@ -2106,13 +2101,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when 'reject_if: :all_blank' and 'allow_destroy: true' are specified" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for \
                 :addresses, reject_if: :all_blank, allow_destroy: true
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for :addresses
             end
@@ -2133,11 +2128,11 @@ describe Mongoid::Attributes::Nested do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:addresses)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -2183,13 +2178,13 @@ describe Mongoid::Attributes::Nested do
 
         context "when a reject proc is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for \
               :game, reject_if: ->(attrs){ attrs[:name].blank? }
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for :game
           end
@@ -2219,13 +2214,13 @@ describe Mongoid::Attributes::Nested do
 
         context "when reject_if => :all_blank is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for \
               :game, reject_if: :all_blank
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for :game
           end
@@ -2270,12 +2265,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game
               end
@@ -2291,12 +2286,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game
               end
@@ -2356,12 +2351,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2378,12 +2373,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2441,12 +2436,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2484,12 +2479,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2509,7 +2504,7 @@ describe Mongoid::Attributes::Nested do
 
               context "when update only is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for \
                     :game,
@@ -2517,7 +2512,7 @@ describe Mongoid::Attributes::Nested do
                     allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2564,11 +2559,11 @@ describe Mongoid::Attributes::Nested do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:game)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -2626,12 +2621,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2647,12 +2642,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2696,12 +2691,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow destroy is true" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2739,12 +2734,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2813,11 +2808,11 @@ describe Mongoid::Attributes::Nested do
 
           context "when the nested document is invalid" do
 
-            before(:all) do
+            before do
               Person.validates_format_of :ssn, without: /\$\$\$/
             end
 
-            after(:all) do
+            after do
               Person.reset_callbacks(:validate)
             end
 
@@ -2866,12 +2861,12 @@ describe Mongoid::Attributes::Nested do
 
         context "when a limit is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :posts_attributes=)
             Person.accepts_nested_attributes_for :posts, limit: 2
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :posts_attributes=)
             Person.accepts_nested_attributes_for :posts
           end
@@ -3141,12 +3136,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is undefined" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :posts_attributes=)
                   Person.accepts_nested_attributes_for :posts
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :posts_attributes=)
                   Person.accepts_nested_attributes_for :posts
                 end
@@ -3294,13 +3289,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when a reject block is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for \
                 :posts, reject_if: ->(attrs){ attrs["title"].blank? }
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for :posts
             end
@@ -3336,13 +3331,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when :reject_if => :all_blank is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for \
                 :posts, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for :posts
             end
@@ -3380,12 +3375,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts
               end
@@ -3441,12 +3436,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts
               end
@@ -3506,7 +3501,7 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow destroy is not defined" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts
               end
@@ -3568,11 +3563,11 @@ describe Mongoid::Attributes::Nested do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:posts)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -3626,12 +3621,12 @@ describe Mongoid::Attributes::Nested do
 
         context "when a limit is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :preferences_attributes=)
             Person.accepts_nested_attributes_for :preferences, limit: 2
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :preferences_attributes=)
             Person.accepts_nested_attributes_for :preferences
           end
@@ -3727,12 +3722,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences
                 end
@@ -3790,12 +3785,12 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences
                 end
@@ -3858,7 +3853,7 @@ describe Mongoid::Attributes::Nested do
 
               context "when allow_destroy is undefined" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences
                 end
@@ -3960,13 +3955,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when a reject block is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for \
                 :preferences, reject_if: ->(attrs){ attrs["name"].blank? }
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for :preferences
             end
@@ -4002,13 +3997,13 @@ describe Mongoid::Attributes::Nested do
 
           context "when :reject_if => :all_blank is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for \
                 :preferences, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for :preferences
             end
@@ -4046,12 +4041,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences
               end
@@ -4107,12 +4102,12 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences
               end
@@ -4172,7 +4167,7 @@ describe Mongoid::Attributes::Nested do
 
             context "when allow destroy is not defined" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences
               end
@@ -4234,11 +4229,11 @@ describe Mongoid::Attributes::Nested do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:preferences)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -4259,7 +4254,7 @@ describe Mongoid::Attributes::Nested do
 
   describe "#update_attributes" do
 
-    before(:all) do
+    before do
       Person.send(:undef_method, :addresses_attributes=)
       Person.accepts_nested_attributes_for :addresses
     end
@@ -4348,7 +4343,7 @@ describe Mongoid::Attributes::Nested do
 
     context "when nesting multiple levels and parent is timestamped" do
 
-      before(:all) do
+      before do
         class Address
           after_save do
             addressable.touch
@@ -4356,7 +4351,7 @@ describe Mongoid::Attributes::Nested do
         end
       end
 
-      after(:all) do
+      after do
         Address.reset_callbacks(:save)
       end
 
@@ -4452,12 +4447,12 @@ describe Mongoid::Attributes::Nested do
 
           context "when cascading callbacks" do
 
-            before(:all) do
+            before do
               Band.accepts_nested_attributes_for :records
               Record.accepts_nested_attributes_for :tracks, allow_destroy: true
             end
 
-            after(:all) do
+            after do
               Band.send(:undef_method, :records_attributes=)
               Record.send(:undef_method, :tracks_attributes=)
             end