mongoid 2.4.11 → 2.4.12

data/CHANGELOG.md

@@ -3,7 +3,22 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 2.4.11 (branch: 2.4.0-stable)
+## 2.4.12
+
+### Resolved Issues
+
+* \#2178 Ensure destroy callbacks are run post replacement of an embeds one
+  relation.
+
+* \#2169 Allow saves to pass when documents are destroyed after the save
+  in a callback.
+
+* \#2144 Uniqueness validation on paranoid documents now properly scopes.
+
+* \#2127 Don't unbind parents of embedded documents mid nested
+  attributes deletion.
+
+## 2.4.11
 
 ### Resolved Issues
 

data/lib/mongoid/persistence.rb

@@ -151,7 +151,7 @@ module Mongoid #:nodoc:
     # @return [ true, false ] True is success, false if not.
     def upsert(options = {})
       if new_record?
-        insert(options).persisted?
+        !insert(options).new_record?
       else
         update(options)
       end

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

@@ -197,8 +197,8 @@ module Mongoid # :nodoc:
                 end
               else
                 doc.delete(:suppress => true)
+                unbind_one(doc)
               end
-              unbind_one(doc)
             end
             reindex
           end
@@ -309,7 +309,7 @@ module Mongoid # :nodoc:
               proxy.clear
             else
               atomically(:$set) do
-                base.delayed_atomic_sets.clear
+                base.delayed_atomic_sets.clear unless _assigning?
                 if replacement.first.is_a?(Hash)
                   replacement = replacement.map do |doc|
                     attributes = { :metadata => metadata, :_parent => base }
@@ -327,6 +327,7 @@ module Mongoid # :nodoc:
                 end
                 if _assigning?
                   name = _unscoped.first.atomic_path
+                  base.delayed_atomic_sets[name].try(:clear)
                   base._children.each do |child|
                     child.delayed_atomic_sets.clear
                   end

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

@@ -39,7 +39,7 @@ module Mongoid # :nodoc:
             if _assigning?
               base.atomic_unsets.push(proxy.atomic_path)
             else
-              proxy.delete if persistable?
+              proxy.destroy if persistable?
             end
             proxy.unbind_one
             return nil unless replacement

data/lib/mongoid/validations/uniqueness.rb

@@ -101,7 +101,7 @@ module Mongoid #:nodoc:
       # @since 2.4.10
       def create_criteria(base, document, attribute, value)
         field = document.fields[attribute.to_s]
-        criteria = base.unscoped
+        criteria = base.paranoid ? base.unscoped.where(:deleted_at => nil) : base.unscoped
         if field.try(:localized?)
           criterion(document, attribute, value).each_pair do |key, value|
             criteria.selector.store(key, value)
@@ -167,6 +167,7 @@ module Mongoid #:nodoc:
         Array.wrap(options[:scope]).each do |item|
           criteria = criteria.where(item => document.attributes[item.to_s])
         end
+        criteria = criteria.where(:deleted_at => nil) if document.paranoid?
         criteria
       end
 

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.11
+  version: 2.4.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -429,7 +429,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4531209101708295137
+      hash: 1387804886696110534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: