mongoid 3.0.9 → 3.0.10

data/CHANGELOG.md

@@ -3,6 +3,70 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.10
+
+### Resolved Issues
+
+* \#2507 Ensure no extra db hits when eager loading has a mix of parents
+  with and without docs. (Douwe Maan)
+
+* \#2505 Ensure `update` and `update_all` from criteria properly handle
+  aliased fields. (Dmitry Krasnoukhov)
+
+* \#2504 `Model#becomes` properly keeps the same id.
+
+* \#2498 Criteria now properly pass provided blocks though `method_missing`.
+
+* \#2496 Embedded documents that were previously stored without ids now
+  properly update and get assigned ids from within Mongoid.
+
+* \#2494 All explicit atomic operations now properly respect aliased fields.
+
+* \#2493 Use `Class#name` instead of `Class#model_name` when setting
+  polymorphic types in case `model_name` has been overridden.
+
+* \#2491 Removed unnecessary merge call in cascadable children.
+
+* \#2485 Removing indexes now always uses strong consistency.
+
+* \#2483 Versioning now handles localized fields. (Lawrence Curtis)
+
+* \#2482 Store find parameters in the `DocumentNotFound` error.
+
+* \#2481 Map/reduce aggregations now properly handle Mongo's batching of
+  reduce jobs in groups of 100 with the state being passed through on the
+  count.
+
+* \#2476 Handle skip and limit outside of range on embeds_many relations
+  gracefully.
+
+* \#2474 Correctly detach 1-1 relations when the child is not yet loaded.
+  (Kostyantyn Stepanyuk)
+
+* \#2451 `relation.deleted` on embedded paranoid documents now works properly
+  again.
+
+* \#2472 Ensure `update_all` on embedded relations works properly when nothing
+  is actually going to be updated.
+
+* \#2469 Nullified documents on relations are now able to be re-added with the
+  same in memory instance.
+
+* \#2454 `Model#as_document` properly allows changes from having a relation to
+  the relation being removed. (James Almond)
+
+* \#2445 Mongoid middleware now properly supports both normal and streamed
+  responses and properly clears the identity map for either.
+
+* \#2367 Embedded documents that are to be deleted via nested attributes no
+  longer become immediately removed from the relation in case the parent
+  validation fails. Instead, they get flagged for destruction and then the
+  removal occurs upon the parent passing validation and going to persist.
+
+  Note this is a behaviour change, but since the API does not change and
+  the previous behaviour was incorrect and did not match AR this was able
+  to go into a point release.
+
 ## 3.0.9
 
 ### Resolved Issues
@@ -470,7 +534,7 @@ For instructions on upgrading to newer versions, visit
           Enumerable, or included gems that inject methods into these
           or Mongoid internals.
 
-* \#1753/#1649 A setter and getter for has_many relations to set it's
+* \#1753/#1649 A setter and getter for has_many relations to set its
   children is now provided. (Piotr Jakubowski)
 
         class Album
@@ -696,7 +760,7 @@ For instructions on upgrading to newer versions, visit
         band.with(database: "secondary).save!
         Band.with(collection: "artists").where(name: "Depeche Mode")
 
-* \#1291 You can now configure on a per-model basis where it's documents are
+* \#1291 You can now configure on a per-model basis where its documents are
   stored with the new and improved `store_in` macro.
 
         class Band
@@ -813,7 +877,7 @@ For instructions on upgrading to newer versions, visit
           index({ name: 1 }, { unique: true, background: true })
         end
 
-      Geospacial indexing needs "2d" as it's direction.
+      Geospacial indexing needs "2d" as its direction.
 
         class Venue
           include Mongoid::Document
@@ -980,11 +1044,11 @@ For instructions on upgrading to newer versions, visit
     If the id is set, but the document for it has not been persisted, accessing
     the relation will return empty results.
 
-    If the id is set and it's document is persisted, accessing the relation
+    If the id is set and its document is persisted, accessing the relation
     will return the document.
 
     If the id is set, but the base document is not saved afterwards, then
-    reloading will return the document to it's original state.
+    reloading will return the document to its original state.
 
 * \#1093 Field serialization strategies have changed on Array, Hash, Integer
   and Boolean to be more consistent and match AR where appropriate.
@@ -1142,7 +1206,31 @@ For instructions on upgrading to newer versions, visit
 * \#685 Attempting to use versioning with embedded documents will now
   raise a proper error alerting the developer this is not allowed.
 
-## 2.4.12 (branch: 2.4.0-stable)
+## 2.5.2 (branch: 2.5.0-stable)
+
+### Resolved Issues
+
+* \#2502 Fixed cache key to properly handle when the document does not
+  include `Mongoid::Timestamps::Updated`. (Arthur Nogueira Neves)
+
+## 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
+
+* This is a release to support the 1.7.0 and higher Mongo and BSON gems and
+  resolves issues that kept the 2.4.x series locked below 1.6.2
+
+## 2.4.12
 
 ### Resolved Issues
 

data/lib/mongoid.rb

@@ -105,7 +105,7 @@ module Mongoid
   #     config.use(name: "mongoid_test", host: "localhost", port: 27017)
   #   end
   #
-  # @return [ Config ] The configuration obejct.
+  # @return [ Config ] The configuration object.
   #
   # @since 1.0.0
   def configure

data/lib/mongoid/atomic.rb

@@ -114,6 +114,7 @@ module Mongoid
     #
     # @since 2.1.0
     def atomic_updates
+      process_flagged_destroys
       mods = Modifiers.new
       generate_atomic_updates(mods, self)
       _children.each do |child|
@@ -302,6 +303,19 @@ module Mongoid
       atomic_path
     end
 
+    def flagged_destroys
+      @flagged_destroys ||= []
+    end
+
+    def process_flagged_destroys
+      _assigning do
+        flagged_destroys.each do |block|
+          block.call
+        end
+      end
+      flagged_destroys.clear
+    end
+
     private
 
     # Get the atomic paths utility for this document.

data/lib/mongoid/atomic/paths/embedded.rb

@@ -33,8 +33,10 @@ module Mongoid
         #
         # @since 2.1.0
         def selector
-          parent.atomic_selector.
-            merge!({ "#{path}._id" => document._id }).merge!(document.shard_key_selector)
+          parent.atomic_selector
+          # @todo: Durran: Bring this back once MongoDB, if ever, goes to fix
+          # this issue: https://jira.mongodb.org/browse/SERVER-831
+          # merge!({ "#{path}._id" => document._id }).merge!(document.shard_key_selector)
         end
       end
     end

data/lib/mongoid/callbacks.rb

@@ -153,7 +153,7 @@ module Mongoid
           Array.wrap(relation).each do |child|
             next if children.include?(child)
             children.add(child) if cascadable_child?(kind, child)
-            children.merge(child.send(:cascadable_children, kind, children))
+            child.send(:cascadable_children, kind, children)
           end
         end
       end

data/lib/mongoid/contextual/aggregable/mongo.rb

@@ -172,7 +172,7 @@ module Mongoid
                 if (agg.min == null || val.max < agg.min) agg.min = val.max;
                 agg.sum += val.sum;
               }
-              agg.count += 1;
+              agg.count += val.count;
             });
             return agg;
           }}

data/lib/mongoid/contextual/memory.rb

@@ -117,7 +117,7 @@ module Mongoid
       # @since 3.0.0
       def each
         if block_given?
-          documents[skipping || 0, limiting || documents.length].each do |doc|
+          (documents[skipping || 0, limiting || documents.length] || []).each do |doc|
             yield doc
           end
         else
@@ -286,7 +286,7 @@ module Mongoid
         docs.each do |doc|
           @selector ||= root.atomic_selector
           doc.write_attributes(attributes)
-          updates["$set"].merge!(doc.atomic_updates["$set"])
+          updates["$set"].merge!(doc.atomic_updates["$set"] || {})
           doc.move_changes
         end
         collection.find(selector).update(updates)

data/lib/mongoid/contextual/mongo.rb

@@ -352,6 +352,7 @@ module Mongoid
       # @since 3.0.4
       def update_documents(attributes, method = :update)
         return false unless attributes
+        attributes = Hash[attributes.map { |k, v| [klass.database_field_name(k.to_s), v] }]
         query.send(method, attributes.__consolidate__)
       end
 

data/lib/mongoid/criteria.rb

@@ -668,7 +668,7 @@ module Mongoid
           klass.send(name, *args, &block)
         end
       else
-        return entries.send(name, *args)
+        return entries.send(name, *args, &block)
       end
     end
 

data/lib/mongoid/criterion/scoping.rb

@@ -44,7 +44,7 @@ module Mongoid
         self
       end
 
-      # Forces the criteria to be scoped, unless it's inside an unscoped block.
+      # Forces the criteria to be scoped, unless its inside an unscoped block.
       #
       # @example Force the criteria to be scoped.
       #   criteria.scoped(skip: 10)

data/lib/mongoid/dirty.rb

@@ -228,7 +228,7 @@ module Mongoid
       end
     end
 
-    # Set the attribute back to it's old value.
+    # Set the attribute back to its old value.
     #
     # @example Reset the attribute.
     #   model.reset_attribute!("name")

data/lib/mongoid/document.rb

@@ -108,7 +108,7 @@ module Mongoid
       identity.hash
     end
 
-    # A Document's is identified absolutely by it's class and database id:
+    # A Document's is identified absolutely by its class and database id:
     #
     # Person.first.identity #=> [Person, Moped::BSON::ObjectId('4f775130a04745933a000003')]
     #
@@ -191,8 +191,10 @@ module Mongoid
       return attributes if frozen?
       embedded_relations.each_pair do |name, meta|
         without_autobuild do
-          relation = send(name)
-          attributes[meta.store_as] = relation.as_document unless relation.blank?
+          relation, stored = send(name), meta.store_as
+          if attributes.has_key?(stored) || !relation.blank?
+            attributes[stored] = relation.as_document
+          end
         end
       end
       attributes
@@ -216,6 +218,7 @@ module Mongoid
         raise ArgumentError, "A class which includes Mongoid::Document is expected"
       end
       became = klass.new(as_document.__deep_copy__)
+      became.id = id
       became.instance_variable_set(:@changed_attributes, changed_attributes)
       became.instance_variable_set(:@errors, errors)
       became.instance_variable_set(:@new_record, new_record?)
@@ -241,7 +244,7 @@ module Mongoid
     # @since 2.4.0
     def cache_key
       return "#{model_key}/new" if new_record?
-      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:number)}" if updated_at
+      return "#{model_key}/#{id}-#{updated_at.utc.to_s(:number)}" unless self[:updated_at].nil?
       "#{model_key}/#{id}"
     end
 

data/lib/mongoid/errors/document_not_found.rb

@@ -24,6 +24,7 @@ module Mongoid
         if !unmatched && !params.is_a?(Hash)
           raise ArgumentError, 'please also supply the unmatched ids'
         end
+        @params = params
         super(
           compose_message(
             message_key(params),

data/lib/mongoid/errors/mixed_relations.rb

@@ -3,7 +3,7 @@ module Mongoid
   module Errors
 
     # This error is raised when trying to reference an embedded document from
-    # a document in another collection that is not it's parent.
+    # a document in another collection that is not its parent.
     #
     # @example An illegal reference to an embedded document.
     #   class Post

data/lib/mongoid/extensions/big_decimal.rb

@@ -30,7 +30,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Object.demongoize(object)

data/lib/mongoid/extensions/date.rb

@@ -30,7 +30,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Date.demongoize(object)

data/lib/mongoid/extensions/date_time.rb

@@ -36,7 +36,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   DateTime.demongoize(object)

data/lib/mongoid/extensions/object.rb

@@ -213,7 +213,7 @@ module Mongoid
           constraint.convert(object)
         end
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Object.demongoize(object)

data/lib/mongoid/extensions/range.rb

@@ -42,7 +42,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Range.demongoize({ "min" => 1, "max" => 5 })

data/lib/mongoid/extensions/set.rb

@@ -18,7 +18,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Set.demongoize({ "min" => 1, "max" => 5 })

data/lib/mongoid/extensions/string.rb

@@ -150,7 +150,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   String.demongoize(object)

data/lib/mongoid/extensions/symbol.rb

@@ -17,7 +17,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Symbol.demongoize(object)

data/lib/mongoid/extensions/time.rb

@@ -31,7 +31,7 @@ module Mongoid
           Mongoid.use_activesupport_time_zone? ? (::Time.zone || ::Time) : ::Time
         end
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   Time.demongoize(object)

data/lib/mongoid/extensions/time_with_zone.rb

@@ -18,7 +18,7 @@ module Mongoid
 
       module ClassMethods
 
-        # Convert the object from it's mongo friendly ruby type to this type.
+        # Convert the object from its mongo friendly ruby type to this type.
         #
         # @example Demongoize the object.
         #   TimeWithZone.demongoize(object)

data/lib/mongoid/fields/standard.rb

@@ -124,7 +124,7 @@ module Mongoid
         @object_id_field ||= (type == Moped::BSON::ObjectId)
       end
 
-      # Does the field pre-process it's default value?
+      # Does the field pre-process its default value?
       #
       # @example Does the field pre-process the default?
       #   field.pre_processed?

data/lib/mongoid/identity_map.rb

@@ -76,7 +76,7 @@ module Mongoid
       end
     end
 
-    # Puts a document in the identity map, accessed by it's id.
+    # Puts a document in the identity map, accessed by its id.
     #
     # @example Put the document in the map.
     #   identity_map.set(document)

data/lib/mongoid/indexes.rb

@@ -37,7 +37,7 @@ module Mongoid
       #
       # @since 3.0.0
       def remove_indexes
-        collection.indexes.each do |spec|
+        with(consistency: :strong).collection.indexes.each do |spec|
           next if spec["name"] == "_id_"
           collection.indexes.drop(spec["key"])
         end and true

data/lib/mongoid/persistence.rb

@@ -99,7 +99,7 @@ module Mongoid
       return true
     end
 
-    # Touch the document, in effect updating it's updated_at timestamp and
+    # Touch the document, in effect updating its updated_at timestamp and
     # optionally the provided field to the current time. If any belongs_to
     # relations exist with a touch option, they will be updated as well.
     #

data/lib/mongoid/persistence/atomic/operation.rb

@@ -32,7 +32,8 @@ module Mongoid
         #
         # @since 2.0.0
         def initialize(document, field, value, options = {})
-          @document, @field, @value = document, field.to_s, value
+          @document, @field, @value =
+            document, document.database_field_name(field.to_s), value
           @options = options
         end
 

data/lib/mongoid/persistence/modification.rb

@@ -20,6 +20,7 @@ module Mongoid
       # @since 2.1.0
       def prepare(&block)
         return false if validating? && document.invalid?(:update)
+        document.process_flagged_destroys
         result = document.run_callbacks(:save) do
           document.run_callbacks(:update) do
             yield(document); true

data/lib/mongoid/relations/accessors.rb

@@ -201,8 +201,7 @@ module Mongoid
         def setter(name, metadata)
           re_define_method("#{name}=") do |object|
             without_autobuild do
-              if relation_exists?(name) || metadata.many? ||
-                (object.blank? && send(name))
+              if metadata.many? || send(name)
                 set_relation(name, send(name).substitute(object.substitutable))
               else
                 __build__(name, object.substitutable, metadata)

data/lib/mongoid/relations/binding.rb

@@ -191,7 +191,7 @@ module Mongoid
       def bind_from_relational_parent(doc)
         check_inverse!(doc)
         bind_foreign_key(doc, base.id)
-        bind_polymorphic_type(doc, base.class.model_name)
+        bind_polymorphic_type(doc, base.class.name)
         bind_inverse(doc, base)
         bind_inverse_of_field(doc, metadata.name)
       end

data/lib/mongoid/relations/bindings/referenced/in.rb

@@ -22,7 +22,7 @@ module Mongoid
             binding do
               check_inverses!(target)
               bind_foreign_key(base, target.id)
-              bind_polymorphic_inverse_type(base, target.class.model_name)
+              bind_polymorphic_inverse_type(base, target.class.name)
               if inverse = metadata.inverse(target)
                 if set_base_metadata
                   bind_inverse_of_field(base, base.metadata_name)

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -103,20 +103,73 @@ module Mongoid
               converted = first ? convert_id(first.class, id) : id
               doc = existing.find(converted)
               if destroyable?(attrs)
-                existing.delete(doc)
-                doc.destroy unless doc.embedded? || doc.destroyed?
+                destroy(parent, existing, doc)
               else
-                attrs.delete_id
-                if metadata.embedded?
-                  doc.assign_attributes(attrs, options)
-                else
-                  doc.update_attributes(attrs, options)
-                end
+                update_document(doc, attrs, options)
               end
             else
               existing.push(Factory.build(metadata.klass, attrs, options)) unless destroyable?(attrs)
             end
           end
+
+          # Destroy the child document, needs to do some checking for embedded
+          # relations and delay the destroy in case parent validation fails.
+          #
+          # @api private
+          #
+          # @example Destroy the child.
+          #   builder.destroy(parent, relation, doc)
+          #
+          # @param [ Document ] parent The parent document.
+          # @param [ Proxy ] relation The relation proxy.
+          # @param [ Document ] doc The doc to destroy.
+          #
+          # @since 3.0.10
+          def destroy(parent, relation, doc)
+            doc.flagged_for_destroy = true
+            if !doc.embedded? || parent.new_record? || doc.paranoid?
+              destroy_document(relation, doc)
+            else
+              parent.flagged_destroys.push(->{ destroy_document(relation, doc) })
+            end
+          end
+
+          # Destroy the document.
+          #
+          # @api private
+          #
+          # @example Destroy the document.
+          #   builder.destroy_document(relation, doc)
+          #
+          # @param [ Proxy ] relation The relation proxy.
+          # @param [ Document ] doc The document to delete.
+          #
+          # @since 3.0.10
+          def destroy_document(relation, doc)
+            relation.delete(doc)
+            doc.destroy unless doc.embedded? || doc.destroyed?
+          end
+
+          # Update the document.
+          #
+          # @api private
+          #
+          # @example Update the document.
+          #   builder.update_document(doc, {}, options)
+          #
+          # @param [ Document ] doc The document to update.
+          # @param [ Hash ] attrs The attributes.
+          # @param [ Hash ] options The options.
+          #
+          # @since 3.0.10
+          def update_document(doc, attrs, options)
+            attrs.delete_id
+            if metadata.embedded?
+              doc.assign_attributes(attrs, options)
+            else
+              doc.update_attributes(attrs, options)
+            end
+          end
         end
       end
     end

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

@@ -148,6 +148,18 @@ module Mongoid
           doc
         end
 
+        # For use only with Mongoid::Paranoia - will be removed in 4.0.
+        #
+        # @example Get the deleted documents from the relation.
+        #   person.paranoid_phones.deleted
+        #
+        # @return [ Criteria ] The deleted documents.
+        #
+        # @since 3.0.10
+        def deleted
+          unscoped.deleted
+        end
+
         # Delete all the documents in the association without running callbacks.
         #
         # @example Delete all documents from the relation.

data/lib/mongoid/relations/proxy.rb

@@ -177,15 +177,12 @@ module Mongoid
         def eager_load_ids(metadata, ids)
           klass, foreign_key = metadata.klass, metadata.foreign_key
           eager_loaded = klass.any_in(foreign_key => ids).entries
-          unless eager_loaded.empty?
-            eager_loaded.each do |doc|
-              base_id = doc.__send__(foreign_key)
-              yield(doc, { foreign_key => base_id })
-            end
-          else
-            ids.each do |id|
-              IdentityMap.clear_many(klass, { foreign_key => id })
-            end
+          ids.each do |id|
+            IdentityMap.clear_many(klass, { foreign_key => id })
+          end
+          eager_loaded.each do |doc|
+            base_id = doc.__send__(foreign_key)
+            yield(doc, { foreign_key => base_id })
           end
         end
       end

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

@@ -232,6 +232,7 @@ module Mongoid
           criteria.update_all(foreign_key => nil)
           target.clear do |doc|
             unbind_one(doc)
+            doc.changed_attributes.delete(foreign_key)
           end
         end
         alias :nullify_all :nullify

data/lib/mongoid/relations/targets/enumerable.rb

@@ -309,7 +309,7 @@ module Mongoid
           !!@executed
         end
 
-        # Reset the enumerable back to it's persisted state.
+        # Reset the enumerable back to its persisted state.
         #
         # @example Reset the enumerable.
         #   enumerable.reset

data/lib/mongoid/state.rb

@@ -42,6 +42,7 @@ module Mongoid
     def flagged_for_destroy?
       @flagged_for_destroy ||= false
     end
+    alias :marked_for_destruction? :flagged_for_destroy?
 
     # Returns true if the +Document+ has been succesfully destroyed, and false
     # if it hasn't. This is determined by the variable @destroyed and NOT

data/lib/mongoid/validations/queryable.rb

@@ -4,7 +4,7 @@ module Mongoid
     module Queryable
 
       # Wrap the validation inside the an execution block that alert's the
-      # session not to clear it's persistence options.
+      # session not to clear its persistence options.
       #
       # @example Execute the validation with a query.
       #   with_query(document) do

data/lib/mongoid/version.rb

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

data/lib/mongoid/versioning.rb

@@ -173,12 +173,32 @@ module Mongoid
     def only_versioned_attributes(hash)
       versioned = {}
       hash.except("versions").each_pair do |name, value|
-        field = fields[name]
-        versioned[name] = value if !field || field.versioned?
+        add_versioned_attribute(versioned, name, value)
       end
       versioned
     end
 
+    # Add the versioned attribute. Will work now for localized fields.
+    #
+    # @api private
+    #
+    # @example Add the versioned attribute.
+    #   model.add_versioned_attribute({}, "name", "test")
+    #
+    # @param [ Hash ] versioned The versioned attributes.
+    # @param [ String ] name The name of the field.
+    # @param [ Object ] value The value for the field.
+    #
+    # @since 3.0.10
+    def add_versioned_attribute(versioned, name, value)
+      field = fields[name]
+      if field && field.localized?
+        versioned["#{name}_translations"] = value
+      else
+        versioned[name] = value if !field || field.versioned?
+      end
+    end
+
     module ClassMethods
 
       # Sets the maximum number of versions to store.

data/lib/rack/mongoid/middleware/identity_map.rb

@@ -4,13 +4,14 @@ module Rack
     module Middleware
 
       # This middleware contains the behaviour needed to properly use the
-      # identity map in Rack based applications.
+      # identity map in Rack based applications. This middleware will properly
+      # handle Rails or Rack streaming responses.
       class IdentityMap
 
         # Initialize the new middleware.
         #
         # @example Init the middleware.
-        # IdentityMap.new(app)
+        #   IdentityMap.new(app)
         #
         # @param [ Object ] app The application.
         #
@@ -22,7 +23,7 @@ module Rack
         # Make the request with the provided environment.
         #
         # @example Make the request.
-        # identity_map.call(env)
+        #   identity_map.call(env)
         #
         # @param [ Object ] env The environment.
         #
@@ -30,7 +31,11 @@ module Rack
         #
         # @since 2.1.0
         def call(env)
-          ::Mongoid.unit_of_work { @app.call(env) }
+          response = @app.call(env)
+          response[2] = ::Rack::BodyProxy.new(response[2]) do
+            ::Mongoid::IdentityMap.clear
+          end
+          response
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -352,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3436548235215749672
+      hash: 1575250359418632703
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: