mongoid 2.0.0.beta.17 → 2.0.0.beta.18

data/lib/mongoid.rb

@@ -31,7 +31,6 @@ require "active_support/time_with_zone"
 require "active_model"
 require "active_model/callbacks"
 require "active_model/conversion"
-require "active_model/deprecated_error_methods"
 require "active_model/errors"
 require "active_model/mass_assignment_security"
 require "active_model/naming"

data/lib/mongoid/atomicity.rb

@@ -20,9 +20,26 @@ module Mongoid #:nodoc:
       _children.inject({ "$set" => _sets, "$pushAll" => {}, :other => {} }) do |updates, child|
         changes = child._sets
         updates["$set"].update(changes)
-        processed[child.class] = true unless changes.empty?
+        unless changes.empty?
+          processed[child._conficting_modification_key] = true
+        end
         
-        target = processed.has_key?(child.class) ? :other : "$pushAll"
+        # MongoDB does not allow "conflicting modifications" to be
+        # performed in a single operation.  Conflicting modifications are
+        # detected by the 'haveConflictingMod' function in MongoDB.
+        # Examination of the code suggests that two modifications (a $set
+        # and a $pushAll, for example) conflict if (1) the key paths being
+        # modified are equal or (2) one key path is a prefix of the other.
+        # So a $set of 'addresses.0.street' will conflict with a $pushAll
+        # to 'addresses', and we will need to split our update into two
+        # pieces.  We do not, however, attempt to match MongoDB's logic
+        # exactly.  Instead, we assume that two updates conflict if the
+        # first component of the two key paths matches.
+        if processed.has_key?(child._conficting_modification_key)
+          target = :other
+        else
+          target = "$pushAll"
+        end
         
         child._pushes.each do |attr, val|
           if updates[target].has_key?(attr)
@@ -38,6 +55,13 @@ module Mongoid #:nodoc:
     end
 
     protected
+    # Get the key used to check for conflicting modifications.  For now, we
+    # just use the first component of _path, and discard the first period
+    # and everything that follows.
+    def _conficting_modification_key
+      _path.sub(/\..*/, '')
+    end
+
     # Get all the push attributes that need to occur.
     def _pushes
       (new_record? && embedded_many? && !_parent.new_record?) ? { _path => raw_attributes } : {}

data/lib/mongoid/paranoia.rb

@@ -47,7 +47,7 @@ module Mongoid #:nodoc:
     # Returns:
     #
     # true
-    def _remove
+    def _remove(options = {})
       now = Time.now
       collection.update({ :_id => self.id }, { '$set' => { :deleted_at => Time.now } })
       @attributes["deleted_at"] = now

data/lib/mongoid/validations/associated.rb

@@ -25,7 +25,7 @@ module Mongoid #:nodoc:
       def validate_each(document, attribute, value)
         values = value.is_a?(Array) ? value : [ value ]
         return if values.collect { |doc| doc.nil? || doc.valid? }.all?
-        document.errors.add(attribute, :invalid, options.merge!(:value => value))
+        document.errors.add(attribute, :invalid, options.merge(:value => value))
       end
     end
   end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.0.0.beta.17"
+  VERSION = "2.0.0.beta.18"
 end

data/lib/mongoid/versioning.rb

@@ -28,7 +28,7 @@ module Mongoid #:nodoc:
       if last_version
         self.versions << last_version.clone
         self.versions.shift if self.class.version_max.present? && self.versions.length > self.class.version_max
-        self.version = version + 1
+        self.version = (version || 1 ) + 1
         @modifications["versions"] = [ nil, @attributes["versions"] ] if @modifications
       end
     end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 17
-  version: 2.0.0.beta.17
+  - 18
+  version: 2.0.0.beta.18
 platform: ruby
 authors: 
 - Durran Jordan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -04:00
+date: 2010-09-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,8 +136,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 19
-        version: 2.0.0.beta.19
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   prerelease: false
   version_requirements: *id008
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 408136898212555646
+      hash: -407375290619395717
       segments: 
       - 0
       version: "0"