mongoid 3.0.10 → 3.0.11

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.11
+
+### Resolved Issues
+
+* \#2522 Fixed `Criteria#with` to return the criteria and not the class.
+
+* \#2518 Fix unit of work call for the identity map when using Passenger.
+
+* \#2512 Ensure nested attributes destroy works with the delayed destroys
+  introduced in 3.0.10 when multiple levels deep.
+
+* \#2509 Don't hit identity map an extra time when the returned value is an
+  empty hash. (Douwe Maan)
+
 ## 3.0.10
 
 ### Resolved Issues

data/lib/mongoid/atomic.rb

@@ -118,6 +118,7 @@ module Mongoid
       mods = Modifiers.new
       generate_atomic_updates(mods, self)
       _children.each do |child|
+        child.process_flagged_destroys
         generate_atomic_updates(mods, child)
       end
       mods
@@ -303,10 +304,26 @@ module Mongoid
       atomic_path
     end
 
+    # Get the flagged destroys.
+    #
+    # @example Get the flagged destroy.
+    #   document.flagged_destroys
+    #
+    # @return [ Array<Proc> ] The flagged destroys.
+    #
+    # @since 3.0.10
     def flagged_destroys
       @flagged_destroys ||= []
     end
 
+    # Process all the pending flagged destroys from nested attributes.
+    #
+    # @example Process all the pending flagged destroys.
+    #   document.process_flagged_destroys
+    #
+    # @return [ Array ] The cleared array.
+    #
+    # @since 3.0.10
     def process_flagged_destroys
       _assigning do
         flagged_destroys.each do |block|

data/lib/mongoid/config.rb

@@ -145,6 +145,18 @@ module Mongoid
       end
     end
 
+    # Is the application running under passenger?
+    #
+    # @example Is the application using passenger?
+    #   config.running_with_passenger?
+    #
+    # @return [ true, false ] If the app is deployed on Passenger.
+    #
+    # @since 3.0.11
+    def running_with_passenger?
+      @running_with_passenger ||= defined?(PhusionPassenger)
+    end
+
     # Get the session configuration or an empty hash.
     #
     # @example Get the sessions configuration.

data/lib/mongoid/criteria.rb

@@ -291,6 +291,7 @@ module Mongoid
       id = extract_id
       id = klass.fields["_id"].mongoize(id) if id
       doc = IdentityMap.get(klass, id || selector.except("_type"))
+      return nil if doc == {}
       doc && doc.matches?(selector) ? doc : first
     end
 
@@ -526,6 +527,26 @@ module Mongoid
       super
     end
 
+    # Tell the next persistance operation to query from a specific collection,
+    # database or session.
+    #
+    # @example Send the criteria to another collection.
+    #   Band.where(name: "Depeche Mode").with(collection: "artists")
+    #
+    # @param [ Hash ] options The storage options.
+    #
+    # @option options [ String, Symbol ] :collection The collection name.
+    # @option options [ String, Symbol ] :database The database name.
+    # @option options [ String, Symbol ] :session The session name.
+    #
+    # @return [ Criteria ] The criteria.
+    #
+    # @since 3.0.0
+    def with(options)
+      Threaded.set_persistence_options(klass, options)
+      self
+    end
+
     # Get a version of this criteria without the options.
     #
     # @example Get the criteria without options.

data/lib/mongoid/railtie.rb

@@ -118,7 +118,11 @@ module Rails
 
       # Need to include the Mongoid identity map middleware.
       initializer "include the identity map" do |app|
-        app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"
+        if ::Mongoid.running_with_passenger?
+          app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap::Passenger"
+        else
+          app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"
+        end
       end
 
       # Instantitate any registered observers after Rails initialization and
@@ -132,6 +136,26 @@ module Rails
         end
       end
 
+      initializer "reconnect to master if application is preloaded" do
+        config.after_initialize do
+          # Unicorn clears the START_CTX when a worker is forked, so if we have
+          # data in START_CTX then we know we're being preloaded. Unicorn does
+          # not provide application-level hooks for executing code after the
+          # process has forked, so we reconnect lazily.
+          if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
+            ::Mongoid.default_session.disconnect
+          end
+
+          # Passenger provides the :starting_worker_process event for executing
+          # code after it has forked, so we use that and reconnect immediately.
+          if ::Mongoid.running_with_passenger?
+            PhusionPassenger.on_event(:starting_worker_process) do |forked|
+              ::Mongoid.default_session.disconnect if forked
+            end
+          end
+        end
+      end
+
       # Rails runs all initializers first before getting into any generator
       # code, so we have no way in the intitializer to know if we are
       # generating a mongoid.yml. So instead of failing, we catch all the

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

@@ -38,7 +38,7 @@ module Mongoid
         def substitute(replacement)
           if replacement != self
             if _assigning?
-              base.add_atomic_unset(target)
+              base.add_atomic_unset(target) unless replacement
             else
               target.destroy if persistable?
             end

data/lib/mongoid/version.rb

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

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

@@ -37,6 +37,38 @@ module Rack
           end
           response
         end
+
+        # Passenger 3 does not execute the block provided to a Rack::BodyProxy
+        # so the identity map never gets cleared. Since there's no streaming
+        # support in it anyways we do not need the proxy functionality.
+        class Passenger
+
+          # Initialize the new middleware.
+          #
+          # @example Init the middleware.
+          #   IdentityMap.new(app)
+          #
+          # @param [ Object ] app The application.
+          #
+          # @since 3.0.11
+          def initialize(app)
+            @app = app
+          end
+
+          # Make the request with the provided environment.
+          #
+          # @example Make the request.
+          #   identity_map.call(env)
+          #
+          # @param [ Object ] env The environment.
+          #
+          # @return [ Array ] The status, headers, and response.
+          #
+          # @since 3.0.11
+          def call(env)
+            ::Mongoid.unit_of_work { @app.call(env) }
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2012-11-04 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: 1575250359418632703
+      hash: 1182744462779695789
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: