mongoid 3.0.11 → 3.0.12

data/CHANGELOG.md

@@ -3,6 +3,24 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 3.0.12
+
+### Resolved Issues
+
+* \#2542 Allow embedded documents using `store_as` to properly alias in
+  criteria.
+
+* \#2541 Ensure that the type change is correct when upcasting/downcasting a
+  document via `Document#becomes` (Łukasz Bandzarewicz)
+
+* \#2529 Fields on subclasses that override fields in the parent where both have
+  defaults with procs now properly override the default in the subclass.
+
+* \#2528 Aliased fields need to be duped when subclassing.
+
+* \#2527 Ensure removal of docs in a `has_many` does a multi update when setting
+  to an empty array.
+
 ## 3.0.11
 
 ### Resolved Issues

data/lib/mongoid/attributes/processing.rb

@@ -53,7 +53,9 @@ module Mongoid
       # @return [ Hash ] The mass assignment options.
       #
       # @since 3.0.7
-      attr_writer :mass_assignment_options
+      def mass_assignment_options=(options)
+        @mass_assignment_options = options
+      end
 
       # If the key provided is the name of a relation or a nested attribute, we
       # need to wait until all other attributes are set before processing

data/lib/mongoid/document.rb

@@ -217,12 +217,14 @@ module Mongoid
       unless klass.include?(Mongoid::Document)
         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?)
       became.instance_variable_set(:@destroyed, destroyed?)
+      became.changed_attributes["_type"] = self.class.to_s
       became._type = klass.to_s
       became
     end

data/lib/mongoid/fields.rb

@@ -444,8 +444,8 @@ module Mongoid
           re_define_method("#{meth}_translations=") do |value|
             attribute_will_change!(name)
             if value
-              value.update_values do |value|
-                field.type.mongoize(value)
+              value.update_values do |_value|
+                field.type.mongoize(_value)
               end
             end
             attributes[name] = value
@@ -483,9 +483,10 @@ module Mongoid
       end
 
       def field_for(name, options)
-        return Fields::Localized.new(name, options) if options[:localize]
-        return Fields::ForeignKey.new(name, options) if options[:identity]
-        Fields::Standard.new(name, options)
+        opts = options.merge(klass: self)
+        return Fields::Localized.new(name, opts) if options[:localize]
+        return Fields::ForeignKey.new(name, opts) if options[:identity]
+        Fields::Standard.new(name, opts)
       end
     end
   end

data/lib/mongoid/fields/standard.rb

@@ -86,6 +86,13 @@ module Mongoid
         @options = options
         @label = options[:label]
         @default_val = options[:default]
+
+        # @todo: Durran, change API in 4.0 to take the class as a parameter.
+        # This is here temporarily to address #2529 without changing the
+        # constructor signature.
+        if default_val.respond_to?(:call)
+          define_default_method(options[:klass])
+        end
       end
 
       # Is the field localized or not?
@@ -186,13 +193,12 @@ module Mongoid
       #
       # @note Ruby's instance_exec was just too slow.
       #
-      # @param [ Document ] doc The document.
+      # @param [ Class, Module ] object The class or module the field is
+      #   defined on.
       #
       # @since 3.0.0
-      def define_default_method(doc)
-        unless doc.respond_to?(default_name)
-          doc.class.__send__(:define_method, default_name, default_val)
-        end
+      def define_default_method(object)
+        object.__send__(:define_method, default_name, default_val)
       end
 
       # Is the field included in the fields that were returned from the
@@ -243,7 +249,6 @@ module Mongoid
       #
       # @since 3.0.0
       def evaluate_default_proc(doc)
-        define_default_method(doc)
         serialize_default(doc.__send__(default_name))
       end
 

data/lib/mongoid/hierarchy.rb

@@ -156,6 +156,7 @@ module Mongoid
       def inherited(subclass)
         super
         @_type = nil
+        subclass.aliased_fields = aliased_fields.dup
         subclass.fields = fields.dup
         subclass.pre_processed_defaults = pre_processed_defaults.dup
         subclass.post_processed_defaults = post_processed_defaults.dup

data/lib/mongoid/railtie.rb

@@ -118,11 +118,7 @@ module Rails
 
       # Need to include the Mongoid identity map middleware.
       initializer "include the identity map" do |app|
-        if ::Mongoid.running_with_passenger?
-          app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap::Passenger"
-        else
-          app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"
-        end
+        app.config.middleware.use "Rack::Mongoid::Middleware::IdentityMap"
       end
 
       # Instantitate any registered observers after Rails initialization and

data/lib/mongoid/relations/macros.rb

@@ -283,8 +283,8 @@ module Mongoid
         #
         # @since 3.0.0
         def embed(name, metadata)
-          self.embedded_relations =
-            embedded_relations.merge(name.to_s => metadata)
+          self.embedded_relations = embedded_relations.merge(name.to_s => metadata)
+          aliased_fields[name.to_s] = metadata.store_as if metadata.store_as
         end
 
         # Defines a field to be used as a foreign key in the relation and

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

@@ -474,7 +474,7 @@ module Mongoid
           if metadata.destructive?
             removed.delete_all
           else
-            removed.update(foreign_key => nil)
+            removed.update_all(foreign_key => nil)
           end
           in_memory.each do |doc|
             if !ids.include?(doc.id)

data/lib/mongoid/version.rb

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

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

@@ -31,43 +31,7 @@ module Rack
         #
         # @since 2.1.0
         def call(env)
-          response = @app.call(env)
-          response[2] = ::Rack::BodyProxy.new(response[2]) do
-            ::Mongoid::IdentityMap.clear
-          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
+          ::Mongoid.unit_of_work { @app.call(env) }
         end
       end
     end

metadata

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