mongoid 2.5.0 → 2.5.1

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 2.5.1
+
+### Resolved Issues
+
+* \#2492 Backport cascading callbacks performance and memory fixes from
+  3.0.0-stable.
+
+* \#2464 Backport the nested attributes fix for keeping many relations in
+  memory when updating attributes. (Chris Thompson)
+
 ## 2.5.0
 
 ### New Features

data/lib/mongoid/callbacks.rb

@@ -23,6 +23,20 @@ module Mongoid #:nodoc:
       define_model_callbacks :create, :destroy, :save, :update
     end
 
+    # Is the provided type of callback executable by this document?
+    #
+    # @example Is the callback executable?
+    # document.callback_executable?(:save)
+    #
+    # @param [ Symbol ] kin The type of callback.
+    #
+    # @return [ true, false ] If the callback can be executed.
+    #
+    # @since 2.5.1
+    def callback_executable?(kind)
+      respond_to?("_#{kind}_callbacks")
+    end
+
     # Run the callbacks for the document. This overrides active support's
     # functionality to cascade callbacks to embedded documents that have been
     # flagged as such.
@@ -39,35 +53,16 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def run_callbacks(kind, *args, &block)
-      run_cascading_callbacks(cascadable_children(kind), kind, *args) {}
-      super(kind, *args, &block)
-    end
-
-    private
-
-    # Execute the callbacks, including all children that have cascade callbacks
-    # set to true.
-    #
-    # @example Run the cascading callbacks.
-    #   document.run_cascading_callbacks([], :update)
-    #
-    # @param [ Array<Document> ] children The cascading children.
-    # @param [ Symbol ] kind The callback type.
-    # @param [ Array ] args The options.
-    #
-    # @since 2.3.0
-    def run_cascading_callbacks(children, kind, *args, &block)
-      if child = children.pop
-        run_cascading_callbacks(children, kind, *args) do
-          child.run_callbacks(child_callback_type(kind, child), *args) do
-            block.call
-          end
+      cascadable_children(kind).each do |child|
+        unless child.run_callbacks(child_callback_type(kind, child), *args)
+          return false
         end
-      else
-        block.call
       end
+      callback_executable?(kind) ? super(kind, *args, &block) : true
     end
 
+    private
+
     # Get all the child embedded documents that are flagged as cascadable.
     #
     # @example Get all the cascading children.

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

@@ -239,15 +239,18 @@ module Mongoid #:nodoc:
         # @example Conditionally find the last document.
         #   person.posts.find(:last, :conditions => { :title => "Sir" })
         #
-        # @param [ Symbol, BSON::ObjectId, Array<BSON::ObjectId> ] arg The
-        #   argument to search with.
-        # @param [ Hash ] options The options to search with.
+        # @note This will keep matching documents in memory for iteration
+        #   later.
+        #
+        # @param [ Moped::BSON::ObjectId, Array<Moped::BSON::ObjectId> ] arg The ids.
         #
         # @return [ Document, Criteria ] The matching document(s).
         #
         # @since 2.0.0.beta.1
         def find(*args)
-          criteria.find(*args)
+          matching = criteria.find(*args)
+          Array(matching).each { |doc| target.push(doc) }
+          matching
         end
 
         # Instantiate a new references_many relation. Will set the foreign key

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -429,7 +429,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2191788509716055350
+      hash: -2098337333332267571
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: