mongoid 3.0.3 → 3.0.4

data/CHANGELOG.md

@@ -3,6 +3,27 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.4 (branch: 3.0.0-stable)
+
+### Resolved Issues
+
+* \#2280 Fix synchronization of many-to-many relations when an ordering default
+  scope exists on either side of the association.
+
+* \#2278 `Criteria#update` now properly updates only the first matching document,
+  where `Criteria#update_all` will update all matching documents. (no flag vs multi).
+
+* \#2274 When loading models, warn if error is raised but continue processing.
+
+* \#2272 Don't wipe selectors or options when removing the default scope for
+  actual nil values. Must check if key exists as well.
+
+* \#2266 Restored paranoid documents are no longer flagged as destroyed.
+  (Mario Uher)
+
+* \#2263 Ensure casting of non object id foreign keys on many to many relations
+  happens in the initial set, not at validation time.
+
 ## 3.0.3
 
 ### Resolved Issues

data/lib/mongoid/contextual/memory.rb

@@ -239,29 +239,57 @@ module Mongoid
         in_place_sort(values) and self
       end
 
+      # Update the first matching document atomically.
+      #
+      # @example Update the matching document.
+      #   context.update(name: "Smiths")
+      #
+      # @param [ Hash ] attributes The new attributes for the document.
+      #
+      # @return [ nil, false ] False if no attributes were provided.
+      #
+      # @since 3.0.0
+      def update(attributes = nil)
+        update_documents(attributes, [ first ])
+      end
+
       # Update all the matching documents atomically.
       #
       # @example Update all the matching documents.
-      #   context.update(name: "Smiths")
+      #   context.update_all(name: "Smiths")
       #
       # @param [ Hash ] attributes The new attributes for each document.
       #
       # @return [ nil, false ] False if no attributes were provided.
       #
       # @since 3.0.0
-      def update(attributes = nil)
+      def update_all(attributes = nil)
+        update_documents(attributes, entries)
+      end
+
+      private
+
+      # Update the provided documents with the attributes.
+      #
+      # @api private
+      #
+      # @example Update the documents.
+      #   context.update_documents({}, doc)
+      #
+      # @param [ Hash ] attributes The attributes.
+      # @param [ Array<Document> ] docs The docs to update.
+      #
+      # @since 3.0.4
+      def update_documents(attributes, docs)
         return false unless attributes
         updates = {}
-        each do |doc|
+        docs.each do |doc|
           @selector ||= root.atomic_selector
           doc.write_attributes(attributes)
           updates.merge!(doc.atomic_position => attributes)
         end
         collection.find(selector).update("$set" => updates)
       end
-      alias :update_all :update
-
-      private
 
       # Get the limiting value.
       #

data/lib/mongoid/contextual/mongo.rb

@@ -308,6 +308,20 @@ module Mongoid
         end
       end
 
+      # Update the first matching document atomically.
+      #
+      # @example Update the first matching document.
+      #   context.update({ "$set" => { name: "Smiths" }})
+      #
+      # @param [ Hash ] attributes The new attributes for each document.
+      #
+      # @return [ nil, false ] False if no attributes were provided.
+      #
+      # @since 3.0.0
+      def update(attributes = nil)
+        update_documents(attributes)
+      end
+
       # Update all the matching documents atomically.
       #
       # @example Update all the matching documents.
@@ -318,14 +332,30 @@ module Mongoid
       # @return [ nil, false ] False if no attributes were provided.
       #
       # @since 3.0.0
-      def update(attributes = nil)
-        return false unless attributes
-        query.update_all(attributes.__consolidate__)
+      def update_all(attributes = nil)
+        update_documents(attributes, :update_all)
       end
-      alias :update_all :update
 
       private
 
+      # Update the documents for the provided method.
+      #
+      # @api private
+      #
+      # @example Update the documents.
+      #   context.update_documents(attrs)
+      #
+      # @param [ Hash ] attributes The updates.
+      # @param [ Symbol ] method The method to use.
+      #
+      # @return [ true, false ] If the update succeeded.
+      #
+      # @since 3.0.4
+      def update_documents(attributes, method = :update)
+        return false unless attributes
+        query.send(method, attributes.__consolidate__)
+      end
+
       # Apply the field limitations.
       #
       # @api private

data/lib/mongoid/criteria.rb

@@ -517,6 +517,20 @@ module Mongoid
       super
     end
 
+    # Get a version of this criteria without the options.
+    #
+    # @example Get the criteria without options.
+    #   criteria.without_options
+    #
+    # @return [ Criteria ] The cloned criteria.
+    #
+    # @since 3.0.4
+    def without_options
+      crit = clone
+      crit.options.clear
+      crit
+    end
+
     private
 
     # Are documents in the query missing, and are we configured to raise an

data/lib/mongoid/criterion/scoping.rb

@@ -32,10 +32,10 @@ module Mongoid
       def remove_scoping(other)
         if other
           selector.reject! do |key, value|
-            other.selector[key] == value
+            other.selector.has_key?(key) && other.selector[key] == value
           end
           options.reject! do |key, value|
-            other.options[key] == value
+            other.options.has_key?(key) && other.options[key] == value
           end
           other.inclusions.each do |meta|
             inclusions.delete_one(meta)

data/lib/mongoid/paranoia.rb

@@ -94,6 +94,8 @@ module Mongoid
       paranoid_collection.find(atomic_selector).
         update({ "$unset" => { paranoid_field => true }})
       attributes.delete("deleted_at")
+      @destroyed = false
+      true
     end
 
     private

data/lib/mongoid/relations/constraint.rb

@@ -35,8 +35,14 @@ module Mongoid
       # @since 2.0.0.rc.7
       def convert(object)
         return object if metadata.polymorphic?
-        klass = metadata.klass
-        klass.using_object_ids? ? Moped::BSON::ObjectId.mongoize(object) : object
+        klass, field = metadata.klass, metadata.klass.fields["_id"]
+        if klass.using_object_ids?
+          Moped::BSON::ObjectId.mongoize(object)
+        elsif object.is_a?(::Array)
+          object.map!{ |obj| field.mongoize(obj) }
+        else
+          field.mongoize(object)
+        end
       end
     end
   end

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

@@ -220,7 +220,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def nullify
-          criteria.update(foreign_key => nil)
+          criteria.update_all(foreign_key => nil)
           target.clear do |doc|
             unbind_one(doc)
           end

data/lib/mongoid/relations/synchronization.rb

@@ -89,10 +89,10 @@ module Mongoid
           end
 
           unless adds.empty?
-            meta.criteria(adds, self.class).add_to_set(meta.inverse_foreign_key, id)
+            meta.criteria(adds, self.class).without_options.add_to_set(meta.inverse_foreign_key, id)
           end
           unless subs.empty?
-            meta.criteria(subs, self.class).pull(meta.inverse_foreign_key, id)
+            meta.criteria(subs, self.class).without_options.pull(meta.inverse_foreign_key, id)
           end
         end
       end

data/lib/mongoid/version.rb

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

data/lib/rails/mongoid.rb

@@ -118,7 +118,11 @@ module Rails
     #
     # @since 2.0.0.rc.3
     def load_model(file)
-      require_dependency(file)
+      begin
+        require_dependency(file)
+      rescue Exception => e
+        Logger.new($stdout).warn(e.message)
+      end
     end
 
     # Given the provided file name, determine the model and return the class.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -354,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2363016562151284772
+      hash: -1276565475413611308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: