mongoid 2.4.7 → 2.4.8

data/CHANGELOG.md

@@ -3,6 +3,32 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
+## 2.4.8
+
+### Resolved Issues
+
+* \#1892 When getting not master operation error, Mongoid should reconnect
+  before retrying the operation.
+
+* \#1887 Don't cascade callbacks to children that don't have the callback
+  defined.
+
+* \#1882 Don't expand duplicate id criterion into an $and with duplicate
+  selections.
+
+* \#1878 Fixed default application values not to apply in certain `only`
+  or `without` selection on iteration, not just `first` and `last`.
+
+* \#1874 Fixed the reject all blank proc constant to handle values
+  properly with a destroy non blank value. (Stefan Daschek)
+
+* \#1869/\#1868 Delayed atomic sets now uses the atomic path instead of
+  the metadata name to fix multiple level embedding issues.
+  (Chris Micacchi provided specs)
+
+* \#1866 Post processed defaults (procs) should be applied post binding
+  of the child in a relation.build.
+
 ## 2.4.7
 
 ### Resolved Issues

data/lib/mongoid.rb

@@ -73,6 +73,7 @@ require "mongoid/sharding"
 require "mongoid/state"
 require "mongoid/timestamps"
 require "mongoid/validations"
+require "mongoid/version"
 require "mongoid/versioning"
 require "mongoid/components"
 require "mongoid/paranoia"

data/lib/mongoid/callbacks.rb

@@ -105,7 +105,7 @@ module Mongoid #:nodoc:
     #
     # @since 2.3.0
     def cascadable_child?(kind, child)
-      return false if kind == :initialize
+      return false if kind == :initialize || !child.respond_to?("_#{kind}_callbacks")
       [ :create, :destroy ].include?(kind) || child.changed? || child.new_record?
     end
 

data/lib/mongoid/collections/retry.rb

@@ -32,6 +32,7 @@ module Mongoid #:nodoc:
           retry
         rescue Mongo::OperationFailure => ex
           if ex.message =~ /not master/
+            Mongoid.reconnect!
             retries = increase_retry_attempts(retries, ex)
             retry
           else

data/lib/mongoid/config.rb

@@ -54,7 +54,9 @@ module Mongoid #:nodoc
     end
 
     # keys to remove from self to not pass through to Mongo::Connection
-    PRIVATE_OPTIONS = %w(uri host hosts port database databases username password logger)
+    PRIVATE_OPTIONS =
+      %w(uri host hosts port database databases username
+         password logger use_activesupport_time_zone)
 
     # Get the blacklisted options from passing through to the driver.
     #

data/lib/mongoid/contexts/mongo.rb

@@ -166,14 +166,12 @@ module Mongoid #:nodoc:
       # @return [ Cursor ] An enumerable +Cursor+ of results.
       def execute
         collection, options = klass.collection, process_options
-        selecting do
-          if criteria.inclusions.any?
-            collection.find(selector, options).entries.tap do |docs|
-              eager_load(docs)
-            end
-          else
-            collection.find(selector, options)
+        if criteria.inclusions.any?
+          collection.find(selector, options).entries.tap do |docs|
+            eager_load(docs)
           end
+        else
+          collection.find(selector, options)
         end
       end
 
@@ -256,9 +254,11 @@ module Mongoid #:nodoc:
       # @example Iterate over the results.
       #   context.iterate { |doc| p doc }
       def iterate(&block)
-        return caching(&block) if cached?
-        if block_given?
-          execute.each { |doc| yield doc }
+        selecting do
+          return caching(&block) if cached?
+          if block_given?
+            execute.each { |doc| yield doc }
+          end
         end
       end
 

data/lib/mongoid/criterion/inclusion.rb

@@ -268,7 +268,7 @@ module Mongoid #:nodoc:
               if key.mongoid_id?
                 if crit.selector.has_key?("$and")
                   crit.selector["$and"] << { key => value }
-                else
+                elsif crit.selector[key] != value
                   crit.selector["$and"] = [{ key => crit.selector.delete(key) }, { key => value }]
                 end
               elsif crit.selector[key].respond_to?(:merge) && value.respond_to?(:merge)

data/lib/mongoid/fields.rb

@@ -92,8 +92,10 @@ module Mongoid #:nodoc
       unless attributes.has_key?(name)
         if field = fields[name]
           default = field.eval_default(self)
-          attribute_will_change!(name)
-          attributes[name] = default
+          unless default.nil?
+            attribute_will_change!(name)
+            attributes[name] = default
+          end
         end
       end
     end

data/lib/mongoid/named_scope.rb

@@ -56,7 +56,8 @@ module Mongoid #:nodoc:
         (class << self; self; end).class_eval <<-EOT
           def #{name}(*args)
             scope = scopes[:#{name}]
-            scope.extend(criteria.fuse(scope.conditions.as_conditions(*args)))
+            conditions = scope.conditions.as_conditions(*args)
+            scope.extend(criteria.fuse(conditions))
           end
         EOT
       end

data/lib/mongoid/nested_attributes.rb

@@ -12,7 +12,7 @@ module Mongoid #:nodoc:
 
     module ClassMethods #:nodoc:
 
-      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }
+      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == '_destroy' || value.blank? } }
 
       # Used when needing to update related models from a parent relation. Can
       # be used on embedded or referenced relations.

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

@@ -94,6 +94,7 @@ module Mongoid # :nodoc:
           Factory.build(type || metadata.klass, attributes, options).tap do |doc|
             doc.identify
             append(doc)
+            doc.apply_proc_defaults
             yield(doc) if block_given?
             doc.run_callbacks(:build) { doc }
           end
@@ -311,14 +312,15 @@ module Mongoid # :nodoc:
                 docs = replacement.compact
                 proxy.target = docs
                 self._unscoped = docs.dup
-                if _assigning?
-                  base.delayed_atomic_sets[metadata.name.to_s] = proxy.as_document
-                end
                 proxy.target.each_with_index do |doc, index|
                   integrate(doc)
                   doc._index = index
                   doc.save if base.persisted? && !_assigning?
                 end
+                if _assigning?
+                  name = proxy.first.atomic_path
+                  base.delayed_atomic_sets[name] = proxy.as_document
+                end
               end
             end
           end

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

@@ -89,6 +89,7 @@ module Mongoid #:nodoc:
 
           Factory.build(type || klass, attributes, options).tap do |doc|
             append(doc)
+            doc.apply_proc_defaults
             yield(doc) if block_given?
             doc.run_callbacks(:build) { doc }
           end

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

@@ -75,6 +75,7 @@ module Mongoid # :nodoc:
           Factory.build(type || klass, attributes, options).tap do |doc|
             base.send(metadata.foreign_key).push(doc.id)
             append(doc)
+            doc.apply_proc_defaults
             doc.synced[metadata.inverse_foreign_key] = false
             yield(doc) if block_given?
           end

data/lib/mongoid/state.rb

@@ -67,7 +67,7 @@ module Mongoid #:nodoc:
       new? &&
         embedded_many? &&
         _parent.persisted? &&
-        !_parent.delayed_atomic_sets[metadata.name.to_s]
+        !_parent.delayed_atomic_sets[atomic_path]
     end
 
     # Determine if the document can be set.

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid #:nodoc
-  VERSION = "2.4.7"
+  VERSION = "2.4.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -459,7 +459,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4230484003984922722
+      hash: 2935457969941610047
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: