mongoid 3.0.4 → 3.0.5

data/CHANGELOG.md

@@ -3,7 +3,38 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 3.0.4 (branch: 3.0.0-stable)
+## 3.0.5 (branch 3.0.0-stable)
+
+* \#2313 Fixed deserialization of `nil` `TimeWithZone` fields. (nagachika)
+
+* \#2311 `Document#changes` no longer returns `nil` values for Array and Hash
+  fields that were only accessed and didn't actually change. Regression from 2.4.x.
+
+* \#2310 Setting a many to many duplicate successively in memory no longer clears
+  the inverse foreign keys.
+
+* \#2309 Allow embeds_one relations to be set with hashes more than just the
+  initial set.
+
+* \#2308 Ensure documents retrieved via `#find` on `has_many` and
+  `has_and_belongs_to_many` relations are kept in memory.
+
+* \#2304 Default scopes now properly merge instead of overwrite when more
+  than one is defined as per expectations with AR.  (Kirill Maksimov)
+
+* \#2300 Ensure reloading refreshes the document in the identity map.
+
+* \#2298 Protect against many to many relations pulling a null set of ids.
+   (Jonathan Hyman)
+
+* \#2291 Fixed touch operations only to update the timestamp and the optional
+  field, no matter what the other changes on the document are.
+
+* \#1091 Allow presence validation to pass if the value is `false`.
+
+### Resolved Issues
+
+## 3.0.4
 
 ### Resolved Issues
 

data/lib/config/locales/en.yml

@@ -440,14 +440,6 @@ en:
             since the child could potentially reference a nonexistant parent."
           resolution: "Make sure to only use create or create! when the parent
             document %{base} is persisted."
-        unsupported_version:
-          message: "MongoDB %{version} not supported, please upgrade to
-            %{mongo_version}."
-          summary: "Mongoid is relying on features that were introduced in
-            MongoDB %{mongo_version} and would cause unexpected behaviour or errors
-            on version %{version}."
-          resolution: "Upgrade your MongoDB instances or keep Mongoid on your
-            previous version."
         unsupported_javascript:
           message: "Executing Javascript $where selector on an embedded criteria
             is not supported."

data/lib/mongoid/atomic.rb

@@ -335,5 +335,28 @@ module Mongoid
       mods.add_to_set(doc.atomic_array_add_to_sets)
       mods.pull_all(doc.atomic_array_pulls)
     end
+
+    # Get the atomic updates for a touch operation. Should only include the
+    # updated_at field and the optional extra field.
+    #
+    # @api private
+    #
+    # @example Get the touch atomic updates.
+    #   document.touch_atomic_updates
+    #
+    # @param [ Symbol ] field The optional field.
+    #
+    # @return [ Hash ] The atomic updates.
+    #
+    # @since 3.0.6
+    def touch_atomic_updates(field = nil)
+      updates = atomic_updates
+      return {} unless atomic_updates.has_key?("$set")
+      touches = {}
+      updates["$set"].each_pair do |key, value|
+        touches.merge!({ key => value }) if key =~ /updated_at|#{field}/
+      end
+      { "$set" => touches }
+    end
   end
 end

data/lib/mongoid/config.rb

@@ -21,6 +21,7 @@ module Mongoid
     option :protect_sensitive_fields, default: true
     option :raise_not_found_error, default: true
     option :scope_overwrite_exception, default: false
+    # @todo: Remove at 4.0
     option :skip_version_check, default: false
     option :use_activesupport_time_zone, default: true
     option :use_utc, default: false

data/lib/mongoid/dirty.rb

@@ -64,7 +64,8 @@ module Mongoid
     def changes
       _changes = {}
       changed.each do |attr|
-        _changes[attr] = attribute_change(attr)
+        change = attribute_change(attr)
+        _changes[attr] = change if change
       end
       _changes
     end

data/lib/mongoid/errors.rb

@@ -36,7 +36,6 @@ require "mongoid/errors/too_many_nested_attribute_records"
 require "mongoid/errors/unknown_attribute"
 require "mongoid/errors/unsaved_document"
 require "mongoid/errors/unsupported_javascript"
-require "mongoid/errors/unsupported_version"
 require "mongoid/errors/validations"
 require "mongoid/errors/versioning_not_on_root"
 require "mongoid/errors/delete_restriction"

data/lib/mongoid/extensions/time_with_zone.rb

@@ -29,6 +29,7 @@ module Mongoid
         #
         # @since 3.0.0
         def demongoize(object)
+          return nil if object.blank?
           ::Time.demongoize(object).in_time_zone
         end
 

data/lib/mongoid/persistence.rb

@@ -120,7 +120,7 @@ module Mongoid
       current = Time.now
       write_attribute(:updated_at, current) if fields["updated_at"]
       write_attribute(field, current) if field
-      _root.collection.find(atomic_selector).update(atomic_updates)
+      _root.collection.find(atomic_selector).update(touch_atomic_updates(field))
       without_autobuild do
         touchables.each { |name| send(name).try(:touch) }
       end

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

@@ -43,6 +43,7 @@ module Mongoid
           end
           unbind_one
           return nil unless replacement
+          replacement = Factory.build(klass, replacement) if replacement.is_a?(::Hash)
           self.target = replacement
           bind_one
           characterize_one(target)

data/lib/mongoid/relations/metadata.rb

@@ -1120,7 +1120,9 @@ module Mongoid
         if other
           matches = []
           other.class.relations.values.each do |meta|
-            matches.push(meta.name) if meta.as == name
+            if meta.as == name && meta.class_name == inverse_class_name
+              matches.push(meta.name)
+            end
           end
           matches
         end

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

@@ -185,13 +185,18 @@ module Mongoid
         # @example Find by multiple ids.
         #   person.posts.find([ Moped::BSON::ObjectId.new, Moped::BSON::ObjectId.new ])
         #
+        # @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/relations/referenced/many_to_many.rb

@@ -146,6 +146,9 @@ module Mongoid
           end
           target.clear do |doc|
             unbind_one(doc)
+            unless metadata.forced_nil_inverse?
+              doc.changed_attributes.delete(inverse_foreign_key)
+            end
           end
         end
         alias :nullify_all :nullify

data/lib/mongoid/relations/synchronization.rb

@@ -59,7 +59,10 @@ module Mongoid
       #
       # @since 2.2.1
       def remove_inverse_keys(meta)
-        meta.criteria(send(meta.foreign_key), self.class).pull(meta.inverse_foreign_key, id)
+        foreign_keys = send(meta.foreign_key)
+        unless foreign_keys.nil? || foreign_keys.empty?
+          meta.criteria(foreign_keys, self.class).pull(meta.inverse_foreign_key, id)
+        end
       end
 
       # Update the inverse keys for the relation.

data/lib/mongoid/reloading.rb

@@ -24,6 +24,7 @@ module Mongoid
       changed_attributes.clear
       apply_defaults
       reload_relations
+      IdentityMap.set(self)
       run_callbacks(:initialize)
       self
     end

data/lib/mongoid/scoping.rb

@@ -40,7 +40,7 @@ module Mongoid
       # @since 1.0.0
       def default_scope(value)
         check_scope_validity(value)
-        self.default_scoping = value.to_proc
+        self.default_scoping = process_default_scope(value)
       end
 
       # Is the class able to have the default scope applied?
@@ -284,6 +284,25 @@ module Mongoid
         SCOPE
       end
 
+      # Process the default scope value. If one already exists, we merge the
+      # new one into the old one.
+      #
+      # @api private
+      #
+      # @example Process the default scope.
+      #   Model.process_default_scope(value)
+      #
+      # @param [ Criteria, Proc ] value The default scope value.
+      #
+      # @since 3.0.5
+      def process_default_scope(value)
+        if existing = default_scoping
+          ->{ existing.call.merge(value.to_proc.call) }
+        else
+          value.to_proc
+        end
+      end
+
       # Strip the default scope from the provided value, if it is a criteria.
       # This is used by named scopes - they should not have the default scoping
       # applied to them.

data/lib/mongoid/validations/presence.rb

@@ -33,14 +33,14 @@ module Mongoid
               attribute,
               :blank_in_locale,
               options.merge(location: _locale)
-            ) if _value.blank?
+            ) if not_present?(_value)
           end
         elsif document.relations.has_key?(attribute.to_s)
           if relation_or_fk_missing?(document, attribute, value)
             document.errors.add(attribute, :blank, options)
           end
         else
-          document.errors.add(attribute, :blank, options) if value.blank?
+          document.errors.add(attribute, :blank, options) if not_present?(value)
         end
       end
 
@@ -65,6 +65,22 @@ module Mongoid
         metadata = doc.relations[attr.to_s]
         metadata.stores_foreign_key? && doc.send(metadata.foreign_key).blank?
       end
+
+      # For guarding against false values.
+      #
+      # @api private
+      #
+      # @example Is the value not present?
+      #   validator.not_present?(value)
+      #
+      # @param [ Object ] value The value.
+      #
+      # @return [ true, false ] If the value is not present.
+      #
+      # @since 3.0.5
+      def not_present?(value)
+        value.blank? && value != false
+      end
     end
   end
 end

data/lib/mongoid/version.rb

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

data/lib/rails/generators/mongoid_generator.rb

@@ -50,6 +50,10 @@ module Mongoid
         "#{name}.errors"
       end
 
+      def delete
+        "#{name}.delete"
+      end
+
       def destroy
         "#{name}.destroy"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -156,7 +156,6 @@ files:
 - lib/mongoid/errors/unknown_attribute.rb
 - lib/mongoid/errors/unsaved_document.rb
 - lib/mongoid/errors/unsupported_javascript.rb
-- lib/mongoid/errors/unsupported_version.rb
 - lib/mongoid/errors/validations.rb
 - lib/mongoid/errors/versioning_not_on_root.rb
 - lib/mongoid/errors.rb
@@ -354,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1276565475413611308
+      hash: -1770994134498643287
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/mongoid/errors/unsupported_version.rb

@@ -1,20 +0,0 @@
-# encoding: utf-8
-module Mongoid
-  module Errors
-
-    # Raised when the database version is not supported by Mongoid.
-    #
-    # @example Create the error.
-    #   UnsupportedVersion.new(Mongo::ServerVersion.new("1.3.1"))
-    class UnsupportedVersion < MongoidError
-      def initialize(version)
-        super(
-          compose_message(
-            "unsupported_version",
-            { version: version, mongo_version: Mongoid::MONGODB_VERSION }
-          )
-        )
-      end
-    end
-  end
-end