mongoid 3.0.15 → 3.0.16

data/CHANGELOG.md

@@ -1,7 +1,41 @@
 # Overview
 
 For instructions on upgrading to newer versions, visit
-[mongoid.org](http://mongoid.org/docs/upgrading.html).
+[mongoid.org](http://mongoid.org/en/mongoid/docs/upgrading.html).
+
+## 3.0.16
+
+### Resolved Issues
+
+* \#2661 Implement instance level `model_name` for documents.
+
+* \#2651 Ensure `Criteria#type` works properly with both symbol and string
+  keys in the selector.
+
+* \#2647 Ensure `deleted?` and `destroyed?` on paranoid documents return the
+  same value.
+
+* \#2646 Set unloaded doc in memory on enumerable targets before yielding to
+  the block.
+
+* \#2645 Take caching into consideration when asking for counts.
+  (Arthur Nogueira Neves)
+
+* \#2642 Don't batch push empty arrays on embedded documents. (Laszlo Bacsi)
+
+* \#2639 Avoid extra unnecesary queries on new records when building relations
+  off of them.
+
+* \#2638 When a criteria is eager loading, calling `first` or `last` then
+  iterating the entire results properly eager loads the full request.
+
+* \#2618 Validating uniqueness now always uses string consistency by default.
+
+* \#2564 Fixed infinite recursion for cases where a relation getter was
+  overridden and called the setter from that method.
+
+* \#2554 Ensure `unscoped` on an `embeds_many` does not include documents
+  flagged for destruction.
 
 ## 3.0.15
 

data/lib/mongoid/contextual/eager.rb

@@ -0,0 +1,158 @@
+# encoding: utf-8
+module Mongoid
+  module Contextual
+    module Eager
+
+      # @attribute [rw] eager_loaded Has the context been eager loaded?
+      attr_accessor :eager_loaded
+
+      private
+
+      # Eager load the inclusions for the provided documents.
+      #
+      # @api private
+      #
+      # @example Eager load the inclusions.
+      #   context.eager_load(docs)
+      #
+      # @param [ Array<Document> ] docs The docs returning from the db.
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 3.0.0
+      def eager_load(docs)
+        load_inclusions(docs)
+        self.eager_loaded = true
+      end
+
+      # Eager load the inclusions for the provided document.
+      #
+      # @api private
+      #
+      # @example Eager load the inclusions.
+      #   context.eager_load(doc)
+      #
+      # @param [ Document ] doc The doc returning from the db.
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 3.0.16
+      def eager_load_one(doc)
+        load_inclusions([ doc ])
+        inclusions_loaded[doc.id] = true
+      end
+
+      # Get the ids that to be used to eager load documents.
+      #
+      # @api private
+      #
+      # @example Get the ids.
+      #   context.eager_load(docs, metadata)
+      #
+      # @param [ Array<Document> ] docs The pre-loaded documents.
+      # @param [ Metadata ] metadata The relation metadata.
+      #
+      # @return [ Array<Object> ] The ids.
+      #
+      # @since 3.0.0
+      def eager_loaded_ids(docs, metadata)
+        if metadata.stores_foreign_key?
+          docs.flat_map{ |doc| doc.send(metadata.foreign_key) }
+        else
+          docs.map(&:id)
+        end
+      end
+
+      # Is this context able to be eager loaded?
+      #
+      # @api private
+      #
+      # @example Is the context eager loadable?
+      #   context.eager_loadable?
+      #
+      # @example Is the single document eager loadable?
+      #   context.eager_loadable?(document)
+      #
+      # @param [ Document ] document The single document to load for.
+      #
+      # @return [ true, false ] If the context is able to be eager loaded.
+      #
+      # @since 3.0.0
+      def eager_loadable?(document = nil)
+        return false if criteria.inclusions.empty?
+        document ? !inclusions_loaded?(document) : !eager_loaded
+      end
+
+      # Has a hash of individual documents that have had their relations reager
+      # loaded.
+      #
+      # @api private
+      #
+      # @example Get the documents with relations eager loaded.
+      #   context.inclusions_loaded
+      #
+      # @return [ Hash ] The documents that have had eager loaded inclusions.
+      #
+      # @since 3.0.16
+      def inclusions_loaded
+        @inclusions_loaded ||= {}
+      end
+
+      # Has the document had its inclusions loaded?
+      #
+      # @api private
+      #
+      # @example Has the document had its inclusions loaded?
+      #   context.inclusions_loaded?(document)
+      #
+      # @param [ Document ] document The document to check.
+      #
+      # @return [ true, false ] If the document had it's inclusions loaded.
+      #
+      # @since 3.0.16
+      def inclusions_loaded?(document)
+        inclusions_loaded.has_key?(document.id)
+      end
+
+      # Eager load the inclusions for the provided documents.
+      #
+      # @api private
+      #
+      # @example Eager load the inclusions.
+      #   context.load_inclusions(docs)
+      #
+      # @param [ Array<Document> ] docs The docs returning from the db.
+      #
+      # @return [ true ] Always true.
+      #
+      # @since 3.0.16
+      def load_inclusions(docs)
+        criteria.inclusions.each do |metadata|
+          metadata.eager_load(eager_loaded_ids(docs, metadata)) if !docs.empty?
+        end
+      end
+
+      # If the provided document exists, eager load its dependencies or return
+      # nil.
+      #
+      # @api private
+      #
+      # @example Eager load if the document is not nil.
+      #   context.with_eager_loading(document)
+      #
+      # @param [ Hash ] document The document from the database.
+      #
+      # @return [ Document, nil ] The instantiated model document.
+      #
+      # @since 3.0.0
+      def with_eager_loading(document)
+        selecting do
+          return nil unless document
+          doc = Factory.from_db(klass, document, criteria.object_id)
+          eager_load_one(doc) if eager_loadable?(doc)
+          doc
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/contextual/mongo.rb

@@ -2,6 +2,7 @@
 require "mongoid/contextual/atomic"
 require "mongoid/contextual/aggregable/mongo"
 require "mongoid/contextual/command"
+require "mongoid/contextual/eager"
 require "mongoid/contextual/find_and_modify"
 require "mongoid/contextual/map_reduce"
 
@@ -11,6 +12,7 @@ module Mongoid
       include Enumerable
       include Aggregable::Mongo
       include Atomic
+      include Eager
 
       # @attribute [r] collection The collection to query against.
       # @attribute [r] criteria The criteria for the context.
@@ -18,9 +20,6 @@ module Mongoid
       # @attribute [r] query The Moped query.
       attr_reader :collection, :criteria, :klass, :query
 
-      # @attribute [rw] eager_loaded Has the context been eager loaded?
-      attr_accessor :eager_loaded
-
       # Is the enumerable of matching documents empty?
       #
       # @example Is the context empty?
@@ -66,7 +65,7 @@ module Mongoid
       # @since 3.0.0
       def count(document = nil, &block)
         return super(&block) if block_given?
-        return query.count unless document
+        return (cached? ? @count ||= query.count : query.count) unless document
         collection.find(criteria.and(_id: document.id).selector).count
       end
 
@@ -79,7 +78,7 @@ module Mongoid
       #
       # @since 3.0.0
       def delete
-        query.count.tap do
+        self.count.tap do
           query.remove_all
         end
       end
@@ -94,7 +93,7 @@ module Mongoid
       #
       # @since 3.0.0
       def destroy
-        destroyed = query.count
+        destroyed = self.count
         each do |doc|
           doc.destroy
         end
@@ -242,7 +241,7 @@ module Mongoid
       #
       # @since 3.0.0
       def length
-        @length ||= query.count
+        @length ||= self.count
       end
       alias :size :length
 
@@ -523,56 +522,6 @@ module Mongoid
         end
       end
 
-      # Eager load the inclusions for the provided documents.
-      #
-      # @example Eager load the inclusions.
-      #   context.eager_load(docs)
-      #
-      # @param [ Array<Document> ] docs The docs returning from the db.
-      #
-      # @return [ true ] Always true.
-      #
-      # @since 3.0.0
-      def eager_load(docs)
-        criteria.inclusions.reject! do |metadata|
-          metadata.eager_load(eager_loaded_ids(docs, metadata)) if !docs.empty?
-        end
-        self.eager_loaded = true
-      end
-
-      # Get the ids that to be used to eager load documents.
-      #
-      # @api private
-      #
-      # @example Get the ids.
-      #   context.eager_load(docs, metadata)
-      #
-      # @param [ Array<Document> ] docs The pre-loaded documents.
-      # @param [ Metadata ] metadata The relation metadata.
-      #
-      # @return [ Array<Object> ] The ids.
-      #
-      # @since 3.0.0
-      def eager_loaded_ids(docs, metadata)
-        if metadata.stores_foreign_key?
-          docs.flat_map{ |doc| doc.send(metadata.foreign_key) }
-        else
-          docs.map(&:id)
-        end
-      end
-
-      # Is this context able to be eager loaded?
-      #
-      # @example Is the context eager loadable?
-      #   context.eager_loadable?
-      #
-      # @return [ true, false ] If the context is able to be eager loaded.
-      #
-      # @since 3.0.0
-      def eager_loadable?
-        !eager_loaded && !criteria.inclusions.empty?
-      end
-
       # Apply all the optional criterion.
       #
       # @example Apply the options.
@@ -608,26 +557,6 @@ module Mongoid
         end
       end
 
-      # If the provided document exists, eager load it's dependencies or return
-      # nil.
-      #
-      # @example Eager load if the document is not nil.
-      #   context.with_eager_loading(document)
-      #
-      # @param [ Hash ] document The document from the database.
-      #
-      # @return [ Document, nil ] The instantiated model document.
-      #
-      # @since 3.0.0
-      def with_eager_loading(document)
-        selecting do
-          return nil unless document
-          doc = Factory.from_db(klass, document, criteria.object_id)
-          eager_load([ doc ]) if eager_loadable?
-          doc
-        end
-      end
-
       # Yield to the document.
       #
       # @api private

data/lib/mongoid/criteria.rb

@@ -747,7 +747,9 @@ module Mongoid
     #
     # @since 3.0.3
     def type_selectable?
-      klass.hereditary? && !selector.keys.include?(:_type)
+      klass.hereditary? &&
+        !selector.keys.include?("_type") &&
+        !selector.keys.include?(:_type)
     end
 
     # Get the selector for type selection.

data/lib/mongoid/document.rb

@@ -153,6 +153,18 @@ module Mongoid
       end
     end
 
+    # Return the model name of the document.
+    #
+    # @example Return the model name.
+    #   document.model_name
+    #
+    # @return [ String ] The model name.
+    #
+    # @since 3.0.16
+    def model_name
+      self.class.model_name
+    end
+
     # Return the key value for the document.
     #
     # @example Return the key.

data/lib/mongoid/indexes.rb

@@ -99,6 +99,9 @@ module Mongoid
         opts = options || {}
         opts[:dropDups] = opts.delete(:drop_dups) if opts.has_key?(:drop_dups)
         opts[:bucketSize] = opts.delete(:bucket_size) if opts.has_key?(:bucket_size)
+        if opts.has_key?(:expire_after_seconds)
+          opts[:expireAfterSeconds] = opts.delete(:expire_after_seconds)
+        end
         opts
       end
 

data/lib/mongoid/indexes/validators/options.rb

@@ -7,7 +7,19 @@ module Mongoid
       module Options
         extend self
 
-        VALID_OPTIONS = [ :background, :drop_dups, :name, :sparse, :unique, :max, :min, :bits, :bucket_size ]
+        VALID_OPTIONS = [
+          :background,
+          :drop_dups,
+          :name,
+          :sparse,
+          :unique,
+          :max,
+          :min,
+          :bits,
+          :bucket_size,
+          :expire_after_seconds
+        ]
+
         VALID_TYPES = [ 1, -1, "2d", "geoHaystack" ]
 
         # Validate the index specification.

data/lib/mongoid/paranoia.rb

@@ -80,6 +80,7 @@ module Mongoid
     def destroyed?
       (@destroyed ||= false) || !!deleted_at
     end
+    alias :deleted? :destroyed?
 
     # Restores a previously soft-deleted document. Handles this by removing the
     # deleted_at flag.

data/lib/mongoid/relations/accessors.rb

@@ -91,6 +91,43 @@ module Mongoid
 
       private
 
+      # Get the relation. Extracted out from the getter method to avoid
+      # infinite recursion when overriding the getter.
+      #
+      # @api private
+      #
+      # @example Get the relation.
+      #   document.get_relation(:name, metadata)
+      #
+      # @param [ Symbol ] name The name of the relation.
+      # @param [ Metadata ] metadata The relation metadata.
+      # @param [ true, false ] reload If the relation is to be reloaded.
+      #
+      # @return [ Proxy ] The relation.
+      #
+      # @since 3.0.16
+      def get_relation(name, metadata, reload = false)
+        variable = "@#{name}"
+        value = if instance_variable_defined?(variable) && !reload
+          instance_variable_get(variable)
+        else
+          _building do
+            _loading do
+              # @note In the case where the record is new and we are binding,
+              # we want to avoid an extra database query when we know it is not
+              # necessary.
+              key = (new_record? && _binding?) ? nil : attributes[metadata.key]
+              __build__(name, key, metadata)
+            end
+          end
+        end
+        if value.nil? && metadata.autobuilding? && !without_autobuild?
+          send("build_#{name}")
+        else
+          value
+        end
+      end
+
       # Is the current code executing without autobuild functionality?
       #
       # @example Is autobuild disabled?
@@ -162,20 +199,8 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def getter(name, metadata)
-          re_define_method(name) do |*args|
-            reload, variable = args.first, "@#{name}"
-            value = if instance_variable_defined?(variable) && !reload
-              instance_variable_get(variable)
-            else
-              _building do
-                _loading { __build__(name, attributes[metadata.key], metadata) }
-              end
-            end
-            if value.nil? && metadata.autobuilding? && !without_autobuild?
-              send("build_#{name}")
-            else
-              value
-            end
+          re_define_method(name) do |reload = false|
+            get_relation(name, metadata, reload)
           end
           self
         end
@@ -216,8 +241,8 @@ module Mongoid
         def setter(name, metadata)
           re_define_method("#{name}=") do |object|
             without_autobuild do
-              if metadata.many? || send(name)
-                set_relation(name, send(name).substitute(object.substitutable))
+              if metadata.many? || get_relation(name, metadata)
+                set_relation(name, get_relation(name, metadata).substitute(object.substitutable))
               else
                 __build__(name, object.substitutable, metadata)
               end

data/lib/mongoid/relations/auto_save.rb

@@ -48,8 +48,7 @@ module Mongoid
 
         # Set up the autosave behaviour for references many and references one
         # relations. When the option is set to true, these relations will get
-        # saved automatically when the parent is first saved, but not if the
-        # parent already exists in the database.
+        # saved automatically when the parent saved, if they are dirty.
         #
         # @example Set up autosave options.
         #   Person.autosave(metadata)

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

@@ -59,7 +59,7 @@ module Mongoid
         #
         # @since 2.4.0
         def concat(docs)
-          batch_insert(docs)
+          batch_insert(docs) unless docs.empty?
           self
         end
 
@@ -302,7 +302,7 @@ module Mongoid
         def unscoped
           criterion = klass.unscoped
           criterion.embedded = true
-          criterion.documents = _unscoped
+          criterion.documents = _unscoped.delete_if(&:marked_for_destruction?)
           criterion
         end
 

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

@@ -165,8 +165,8 @@ module Mongoid
           else
             _unloaded.each do |doc|
               document = _added.delete(doc.id) || _loaded.delete(doc.id) || doc
-              yield(document)
               _loaded[document.id] = document
+              yield(document)
             end
           end
           _added.each_pair do |id, doc|

data/lib/mongoid/validations/uniqueness.rb

@@ -267,7 +267,9 @@ module Mongoid
       # @since 2.4.10
       def validate_root(document, attribute, value)
         criteria = create_criteria(klass, document, attribute, value)
-        add_error(document, attribute, value) if criteria.exists?
+        if criteria.with(consistency: :strong).exists?
+          add_error(document, attribute, value)
+        end
       end
 
       # Are we required to validate the document?

data/lib/mongoid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 3.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -107,6 +107,7 @@ files:
 - lib/mongoid/contextual/aggregable/mongo.rb
 - lib/mongoid/contextual/atomic.rb
 - lib/mongoid/contextual/command.rb
+- lib/mongoid/contextual/eager.rb
 - lib/mongoid/contextual/find_and_modify.rb
 - lib/mongoid/contextual/map_reduce.rb
 - lib/mongoid/contextual/memory.rb