mongoid 3.0.2 → 3.0.3

data/CHANGELOG.md

@@ -3,7 +3,22 @@
 For instructions on upgrading to newer versions, visit
 [mongoid.org](http://mongoid.org/docs/upgrading.html).
 
-## 3.0.2 (branch: 3.0.0-stable)
+## 3.0.3
+
+### Resolved Issues
+
+* \#2259 Ensure subclassed documents can not be pulled from the identity map
+  via an id of another document in the same collection with a parent or
+  sibeling type.
+
+* \#2254 $inc operations no longer convert all values to floats.
+
+* \#2252 Don't fire autosave when before callbacks have terminated.
+
+* \#2248 Improved the performance of `exists?` on criteria and relations.
+  (Jonathan Hyman)
+
+## 3.0.2
 
 ### Resolved Issues
 

data/lib/mongoid/callbacks.rb

@@ -34,6 +34,8 @@ module Mongoid
       define_model_callbacks :initialize, only: :after
       define_model_callbacks :build, only: :after
       define_model_callbacks :create, :destroy, :save, :update, :upsert
+
+      attr_accessor :before_callback_halted
     end
 
     # Run only the after callbacks for the specific event.
@@ -100,6 +102,21 @@ module Mongoid
 
     private
 
+    # We need to hook into this for autosave, since we don't want it firing if
+    # the before callbacks were halted.
+    #
+    # @api private
+    #
+    # @example Was a before callback halted?
+    #   document.before_callback_halted?
+    #
+    # @return [ true, false ] If a before callback was halted.
+    #
+    # @since 3.0.3
+    def before_callback_halted?
+      !!@before_callback_halted
+    end
+
     # Get all the child embedded documents that are flagged as cascadable.
     #
     # @example Get all the cascading children.
@@ -169,6 +186,21 @@ module Mongoid
       end
     end
 
+    # We need to hook into this for autosave, since we don't want it firing if
+    # the before callbacks were halted.
+    #
+    # @api private
+    #
+    # @example Hook into the halt.
+    #   document.halted_callback_hook(filter)
+    #
+    # @param [ Symbol ] filter The callback that halted.
+    #
+    # @since 3.0.3
+    def halted_callback_hook(filter)
+      @before_callback_halted = true
+    end
+
     # Run only the callbacks for the target location (before, after, around)
     # and kind (save, update, create).
     #

data/lib/mongoid/contextual/mongo.rb

@@ -30,7 +30,7 @@ module Mongoid
       #
       # @since 3.0.0
       def blank?
-        count == 0
+        !exists?
       end
       alias :empty? :blank?
 
@@ -151,7 +151,8 @@ module Mongoid
       #
       # @since 3.0.0
       def exists?
-        count > 0
+        # Don't use count here since Mongo does not use counted b-tree indexes
+        !query.dup.select(_id: 1).limit(1).entries.first.nil?
       end
 
       # Run an explain on the criteria.
@@ -214,7 +215,7 @@ module Mongoid
       def initialize(criteria)
         @criteria, @klass, @cache = criteria, criteria.klass, criteria.options[:cache]
         @collection = klass.collection
-        add_type_selection
+        criteria.send(:merge_type_selection)
         @query = collection.find(criteria.selector)
         apply_options
       end
@@ -325,21 +326,6 @@ module Mongoid
 
       private
 
-      # For models where inheritance is at play we need to add the type
-      # selection.
-      #
-      # @example Add the type selection.
-      #   context.add_type_selection
-      #
-      # @return [ true, false ] If type selection was added.
-      #
-      # @since 3.0.0
-      def add_type_selection
-        if klass.hereditary? && !criteria.selector.keys.include?(:_type)
-          criteria.selector.merge!(_type: { "$in" => klass._types })
-        end
-      end
-
       # Apply the field limitations.
       #
       # @api private

data/lib/mongoid/criteria.rb

@@ -178,18 +178,6 @@ module Mongoid
       multi ? result : result.first
     end
 
-    # Return true if the criteria has some Document or not.
-    #
-    # @example Are there any documents for the criteria?
-    #   criteria.exists?
-    #
-    # @return [ true, false ] If documents match.
-    #
-    # @since 1.0.0
-    def exists?
-      context.count > 0
-    end
-
     # Extract a single id from the provided criteria. Could be in an $and
     # query or a straight _id query.
     #
@@ -594,12 +582,11 @@ module Mongoid
     #
     # @since 1.0.0
     def initialize_copy(other)
-      @selector = other.selector.dup
-      @options = other.options.dup
       @inclusions = other.inclusions.dup
       @scoping_options = other.scoping_options
       @documents = other.documents.dup
       @context = nil
+      super
     end
 
     # Get documents from the database only.
@@ -632,9 +619,10 @@ module Mongoid
     # @since 3.0.0
     def from_identity_map(ids)
       result = []
+      selection = selector_with_type_selection
       ids.reject! do |id|
         doc = IdentityMap.get(klass, id)
-        doc && doc.matches?(selector) ? result.push(doc) : false
+        doc && doc.matches?(selection) ? result.push(doc) : false
       end
       result
     end
@@ -661,6 +649,19 @@ module Mongoid
       end
     end
 
+    # For models where inheritance is at play we need to add the type
+    # selection.
+    #
+    # @example Add the type selection.
+    #   criteria.merge_type_selection
+    #
+    # @return [ true, false ] If type selection was added.
+    #
+    # @since 3.0.3
+    def merge_type_selection
+      selector.merge!(type_selection) if type_selectable?
+    end
+
     # Convert all the ids to their proper types.
     #
     # @api private
@@ -688,5 +689,47 @@ module Mongoid
     def raise_invalid
       raise Errors::InvalidFind.new
     end
+
+    # Is the criteria type selectable?
+    #
+    # @api private
+    #
+    # @example If the criteria type selectable?
+    #   criteria.type_selectable?
+    #
+    # @return [ true, false ] If type selection should be added.
+    #
+    # @since 3.0.3
+    def type_selectable?
+      klass.hereditary? && !selector.keys.include?(:_type)
+    end
+
+    # Get the selector for type selection.
+    #
+    # @api private
+    #
+    # @example Get a type selection hash.
+    #   criteria.type_selection
+    #
+    # @return [ Hash ] The type selection.
+    #
+    # @since 3.0.3
+    def type_selection
+      { _type: { "$in" => klass._types }}
+    end
+
+    # Get a new selector with type selection in it.
+    #
+    # @api private
+    #
+    # @example Get a selector with type selection.
+    #   criteria.selector_with_type_selection
+    #
+    # @return [ Hash ] The selector.
+    #
+    # @since 3.0.3
+    def selector_with_type_selection
+      type_selectable? ? selector.merge(type_selection) : selector
+    end
   end
 end

data/lib/mongoid/extensions/big_decimal.rb

@@ -3,6 +3,18 @@ module Mongoid
   module Extensions
     module BigDecimal
 
+      # Convert the big decimal to an $inc-able value.
+      #
+      # @example Convert the big decimal.
+      #   bd.__to_inc__
+      #
+      # @return [ Float ] The big decimal as a float.
+      #
+      # @since 3.0.3
+      def __to_inc__
+        to_f
+      end
+
       # Turn the object from the ruby type we deal with to a Mongo friendly
       # type.
       #

data/lib/mongoid/extensions/object.rb

@@ -52,6 +52,18 @@ module Mongoid
         self
       end
 
+      # Conversion of an object to an $inc-able value.
+      #
+      # @example Convert the object.
+      #   1.__to_inc__
+      #
+      # @return [ Object ] The object.
+      #
+      # @since 3.0.3
+      def __to_inc__
+        self
+      end
+
       # Do or do not, there is no try. -- Yoda.
       #
       # @example Do or do not.

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

@@ -17,13 +17,28 @@ module Mongoid
         # @since 2.0.0
         def persist
           prepare do
-            self.value = value.to_f
             current = document[field] || 0
             document[field] = current + value
             execute("$inc")
             document[field]
           end
         end
+
+        private
+
+        # In case we need to cast going to the database.
+        #
+        # @api private
+        #
+        # @example Cast the value.
+        #   operation.cast_value
+        #
+        # @return [ Integer, Float ] The value casted.
+        #
+        # @since 3.0.3
+        def cast_value
+          value.__to_inc__
+        end
       end
     end
   end

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

@@ -47,7 +47,7 @@ module Mongoid
         #
         # @since 2.0.0
         def operation(modifier)
-          { modifier => { path => value } }
+          { modifier => { path => cast_value } }
         end
 
         # Get the path to the field that is getting atomically updated.
@@ -82,6 +82,20 @@ module Mongoid
 
         private
 
+        # In case we need to cast going to the database.
+        #
+        # @api private
+        #
+        # @example Cast the value.
+        #   operation.cast_value
+        #
+        # @return [ Object ] The value.
+        #
+        # @since 3.0.3
+        def cast_value
+          value
+        end
+
         # Executes the common functionality between operations.
         #
         # @api private

data/lib/mongoid/relations/auto_save.rb

@@ -61,14 +61,19 @@ module Mongoid
           if metadata.autosave? && autosavable?(metadata)
             autosaved_relations.push(metadata.name)
             set_callback :save, :after, unless: :autosaved? do |document|
-              begin_autosave
-              relation = document.send(metadata.name)
-              if relation
-                (relation.do_or_do_not(:in_memory) || Array.wrap(relation)).each do |doc|
-                  doc.save
+              # @todo: Durran: Remove with Rails 4 after callback termination.
+              if before_callback_halted?
+                self.before_callback_halted = false
+              else
+                begin_autosave
+                relation = document.send(metadata.name)
+                if relation
+                  (relation.do_or_do_not(:in_memory) || Array.wrap(relation)).each do |doc|
+                    doc.save
+                  end
                 end
+                exit_autosave
               end
-              exit_autosave
             end
           end
         end

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

@@ -178,6 +178,16 @@ module Mongoid
           remove_all(conditions, :destroy)
         end
 
+        # Determine if any documents in this relation exist in the database.
+        #
+        # @example Are there persisted documents?
+        #   person.posts.exists?
+        #
+        # @return [ true, false ] True is persisted documents exist, false if not.
+        def exists?
+          count > 0
+        end
+
         # Finds a document in this association through several different
         # methods.
         #

data/lib/mongoid/relations/many.rb

@@ -72,16 +72,6 @@ module Mongoid
         doc
       end
 
-      # Determine if any documents in this relation exist in the database.
-      #
-      # @example Are there persisted documents?
-      #   person.posts.exists?
-      #
-      # @return [ true, false ] True is persisted documents exist, false if not.
-      def exists?
-        count > 0
-      end
-
       # Find the first document given the conditions, or creates a new document
       # with the conditions that were supplied.
       #

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

@@ -166,6 +166,16 @@ module Mongoid
           target.each { |doc| yield(doc) if block_given? }
         end
 
+        # Determine if any documents in this relation exist in the database.
+        #
+        # @example Are there persisted documents?
+        #   person.posts.exists?
+        #
+        # @return [ true, false ] True is persisted documents exist, false if not.
+        def exists?
+          criteria.exists?
+        end
+
         # Find the matchind document on the association, either based on id or
         # conditions.
         #

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 description: Mongoid is an ODM (Object Document Mapper) Framework for MongoDB, written
   in Ruby.
 email:
@@ -354,7 +354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2401816609188543871
+      hash: -2363016562151284772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: