mongoid 4.0.0 → 4.0.2

data/lib/mongoid/relations/counter_cache.rb

@@ -108,7 +108,7 @@ module Mongoid
               record[cache_column] = (record[cache_column] || 0) + 1
 
               if record.persisted?
-                record.class.increment_counter(cache_column, record.id)
+                record.class.increment_counter(cache_column, record._id)
                 record.remove_change(cache_column)
               end
             end
@@ -119,7 +119,7 @@ module Mongoid
               record[cache_column] = (record[cache_column] || 0) - 1
 
               if record.persisted?
-                record.class.decrement_counter(cache_column, record.id)
+                record.class.decrement_counter(cache_column, record._id)
                 record.remove_change(cache_column)
               end
             end

data/lib/mongoid/relations/many.rb

@@ -98,6 +98,27 @@ module Mongoid
         find_or(:create, attrs, type, &block)
       end
 
+      # Find the first document given the conditions, or creates a new document
+      # with the conditions that were supplied. This will raise an error if validation fails.
+      #
+      # @example Find or create.
+      #   person.posts.find_or_create_by!(:title => "Testing")
+      #
+      # @overload find_or_create_by!(attributes = nil, type = nil)
+      #   @param [ Hash ] attributes The attributes to search or create with.
+      #   @param [ Class ] type The optional type of document to create.
+      #
+      # @overload find_or_create_by!(attributes = nil, type = nil)
+      #   @param [ Hash ] attributes The attributes to search or create with.
+      #   @param [ Class ] type The optional type of document to create.
+      #
+      # @raise [ Errors::Validations ] If validation failed.
+      #
+      # @return [ Document ] An existing document or newly created one.
+      def find_or_create_by!(attrs = {}, type = nil, &block)
+        find_or(:create!, attrs, type, &block)
+      end
+
       # Find the first +Document+ given the conditions, or instantiates a new document
       # with the conditions that were supplied
       #

data/lib/mongoid/relations/one.rb

@@ -53,7 +53,7 @@ module Mongoid
       #
       # @since 4.0.0
       def __evolve_object_id__
-        target.id
+        target._id
       end
     end
   end

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

@@ -281,10 +281,10 @@ module Mongoid
         def substitute(replacement)
           if replacement
             new_docs, docs = replacement.compact, []
-            new_ids = new_docs.map { |doc| doc.id }
+            new_ids = new_docs.map { |doc| doc._id }
             remove_not_in(new_ids)
             new_docs.each do |doc|
-              docs.push(doc) if doc.send(foreign_key) != base.id
+              docs.push(doc) if doc.send(foreign_key) != base._id
             end
             concat(docs)
           else
@@ -304,7 +304,7 @@ module Mongoid
         # @since 2.4.0
         def unscoped
           klass.unscoped.where(
-            foreign_key => Conversions.flag(base.id, __metadata)
+            foreign_key => Conversions.flag(base._id, __metadata)
           )
         end
 
@@ -492,7 +492,7 @@ module Mongoid
             removed.update_all(foreign_key => nil)
           end
           in_memory.each do |doc|
-            if !ids.include?(doc.id)
+            if !ids.include?(doc._id)
               unbind_one(doc)
               target.delete(doc)
               if __metadata.destructive?

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

@@ -55,12 +55,12 @@ module Mongoid
             next unless doc
             append(doc)
             if persistable? || _creating?
-              ids[doc.id] = true
+              ids[doc._id] = true
               save_or_delay(doc, docs, inserts)
             else
               existing = base.send(foreign_key)
-              unless existing.include?(doc.id)
-                existing.push(doc.id) and unsynced(base, foreign_key)
+              unless existing.include?(doc._id)
+                existing.push(doc._id) and unsynced(base, foreign_key)
               end
             end
           end
@@ -90,7 +90,7 @@ module Mongoid
         # @since 2.0.0.beta.1
         def build(attributes = {}, type = nil)
           doc = Factory.build(type || klass, attributes)
-          base.send(foreign_key).push(doc.id)
+          base.send(foreign_key).push(doc._id)
           append(doc)
           doc.apply_post_processed_defaults
           unsynced(doc, inverse_foreign_key)
@@ -134,7 +134,7 @@ module Mongoid
             execute_callback :before_remove, doc
           end
           unless __metadata.forced_nil_inverse?
-            criteria.pull(inverse_foreign_key => base.id)
+            criteria.pull(inverse_foreign_key => base._id)
           end
           if persistable?
             base.set(foreign_key => base.send(foreign_key).clear)

data/lib/mongoid/relations/synchronization.rb

@@ -61,7 +61,7 @@ module Mongoid
       def remove_inverse_keys(meta)
         foreign_keys = send(meta.foreign_key)
         unless foreign_keys.nil? || foreign_keys.empty?
-          meta.criteria(foreign_keys, self.class).pull(meta.inverse_foreign_key => id)
+          meta.criteria(foreign_keys, self.class).pull(meta.inverse_foreign_key => _id)
         end
       end
 
@@ -87,15 +87,15 @@ module Mongoid
           # had occurred.
           if meta.autosave?
             send(meta.name).in_memory.each do |doc|
-              adds.delete_one(doc.id)
+              adds.delete_one(doc._id)
             end
           end
 
           unless adds.empty?
-            meta.criteria(adds, self.class).without_options.add_to_set(meta.inverse_foreign_key => id)
+            meta.criteria(adds, self.class).without_options.add_to_set(meta.inverse_foreign_key => _id)
           end
           unless subs.empty?
-            meta.criteria(subs, self.class).without_options.pull(meta.inverse_foreign_key => id)
+            meta.criteria(subs, self.class).without_options.pull(meta.inverse_foreign_key => _id)
           end
         end
       end

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

@@ -59,7 +59,7 @@ module Mongoid
         #
         # @since 2.1.0
         def <<(document)
-          _added[document.id] = document
+          _added[document._id] = document
           self
         end
         alias :push :<<
@@ -110,9 +110,9 @@ module Mongoid
         #
         # @since 2.1.0
         def delete(document)
-          doc = (_loaded.delete(document.id) || _added.delete(document.id))
+          doc = (_loaded.delete(document._id) || _added.delete(document._id))
           unless doc
-            if _unloaded && _unloaded.where(_id: document.id).exists?
+            if _unloaded && _unloaded.where(_id: document._id).exists?
               yield(document) if block_given?
               return document
             end
@@ -128,7 +128,7 @@ module Mongoid
         #
         # @example Delete all matching documents.
         #   enumerable.delete_if do |doc|
-        #     dod.id == id
+        #     dod._id == _id
         #   end
         #
         # @return [ Array<Document> ] The remaining docs.
@@ -138,8 +138,8 @@ module Mongoid
           load_all!
           deleted = in_memory.select(&block)
           deleted.each do |doc|
-            _loaded.delete(doc.id)
-            _added.delete(doc.id)
+            _loaded.delete(doc._id)
+            _added.delete(doc._id)
           end
           self
         end
@@ -179,8 +179,8 @@ module Mongoid
             end
           else
             unloaded_documents.each do |doc|
-              document = _added.delete(doc.id) || _loaded.delete(doc.id) || doc
-              _loaded[document.id] = document
+              document = _added.delete(doc._id) || _loaded.delete(doc._id) || doc
+              _loaded[document._id] = document
               yield(document)
             end
           end
@@ -237,7 +237,7 @@ module Mongoid
           else
             @_added, @executed = {}, true
             @_loaded = target.inject({}) do |_target, doc|
-              _target[doc.id] = doc
+              _target[doc._id] = doc
               _target
             end
           end
@@ -255,7 +255,7 @@ module Mongoid
         # @since 3.0.0
         def include?(doc)
           return super unless _unloaded
-          _unloaded.where(_id: doc.id).exists? || _added.has_key?(doc.id)
+          _unloaded.where(_id: doc._id).exists? || _added.has_key?(doc._id)
         end
 
         # Inspection will just inspect the entries for nice array-style

data/lib/mongoid/reloadable.rb

@@ -21,7 +21,7 @@ module Mongoid
     def reload
       reloaded = _reload
       if Mongoid.raise_not_found_error && reloaded.empty?
-        raise Errors::DocumentNotFound.new(self.class, id, id)
+        raise Errors::DocumentNotFound.new(self.class, _id, _id)
       end
       @attributes = reloaded
       @attributes_before_type_cast = {}
@@ -57,7 +57,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(with(read: :primary).collection.find(_id: id).one || {})
+      {}.merge(with(read: :primary).collection.find(_id: _id).one || {})
     end
 
     # Reload the embedded document.
@@ -70,7 +70,7 @@ module Mongoid
     # @since 2.3.2
     def reload_embedded_document
       extract_embedded_attributes({}.merge(
-        _root.with(read: :primary).collection.find(_id: _root.id).one
+        _root.with(read: :primary).collection.find(_id: _root._id).one
       ))
     end
 

data/lib/mongoid/sessions/options.rb

@@ -39,8 +39,13 @@ module Mongoid
 
       def mongo_session
         if persistence_options
-          session_name = persistence_options[:session] || self.class.session_name
-          Sessions.with_name(session_name).with(persistence_options)
+          if persistence_options[:session]
+            session = Sessions.with_name(persistence_options[:session])
+          else
+            session = Sessions.with_name(self.class.session_name)
+            session.use(self.class.database_name)
+          end
+          session.with(persistence_options)
         end
       end
 

data/lib/mongoid/threaded.rb

@@ -6,6 +6,17 @@ module Mongoid
   # This module contains logic for easy access to objects that have a lifecycle
   # on the current thread.
   module Threaded
+    DATABASE_OVERRIDE_KEY = "[mongoid]:db-override"
+    SESSIONS_KEY = "[mongoid]:sessions"
+    SESSION_OVERRIDE_KEY = "[mongoid]:session-override"
+    SCOPE_STACK_KEY = "[mongoid]:scope-stack"
+    AUTOSAVES_KEY = "[mongoid]:autosaves"
+    VALIDATIONS_KEY = "[mongoid]:validations"
+
+    STACK_KEYS = Hash.new do |hash, key|
+      hash[key] = "[mongoid]:#{key}-stack"
+    end
+
     extend self
 
     # Begin entry into a named thread local stack.
@@ -31,7 +42,7 @@ module Mongoid
     #
     # @since 3.0.0
     def database_override
-      Thread.current["[mongoid]:db-override"]
+      Thread.current[DATABASE_OVERRIDE_KEY]
     end
 
     # Set the global database override.
@@ -45,7 +56,7 @@ module Mongoid
     #
     # @since 3.0.0
     def database_override=(name)
-      Thread.current["[mongoid]:db-override"] = name
+      Thread.current[DATABASE_OVERRIDE_KEY] = name
     end
 
     # Get the database sessions from the current thread.
@@ -57,7 +68,7 @@ module Mongoid
     #
     # @since 3.0.0
     def sessions
-      Thread.current["[mongoid]:sessions"] ||= {}
+      Thread.current[SESSIONS_KEY] ||= {}
     end
 
     # Are in the middle of executing the named stack
@@ -99,7 +110,7 @@ module Mongoid
     #
     # @since 2.4.0
     def stack(name)
-      Thread.current["[mongoid]:#{name}-stack"] ||= []
+      Thread.current[STACK_KEYS[name]] ||= []
     end
 
     # Begin autosaving a document on the current thread.
@@ -111,7 +122,7 @@ module Mongoid
     #
     # @since 3.0.0
     def begin_autosave(document)
-      autosaves_for(document.class).push(document.id)
+      autosaves_for(document.class).push(document._id)
     end
 
     # Begin validating a document on the current thread.
@@ -123,7 +134,7 @@ module Mongoid
     #
     # @since 2.1.9
     def begin_validate(document)
-      validations_for(document.class).push(document.id)
+      validations_for(document.class).push(document._id)
     end
 
     # Exit autosaving a document on the current thread.
@@ -135,7 +146,7 @@ module Mongoid
     #
     # @since 3.0.0
     def exit_autosave(document)
-      autosaves_for(document.class).delete_one(document.id)
+      autosaves_for(document.class).delete_one(document._id)
     end
 
     # Exit validating a document on the current thread.
@@ -147,7 +158,7 @@ module Mongoid
     #
     # @since 2.1.9
     def exit_validate(document)
-      validations_for(document.class).delete_one(document.id)
+      validations_for(document.class).delete_one(document._id)
     end
 
     # Get the global session override.
@@ -159,7 +170,7 @@ module Mongoid
     #
     # @since 3.0.0
     def session_override
-      Thread.current["[mongoid]:session-override"]
+      Thread.current[SESSION_OVERRIDE_KEY]
     end
 
     # Set the global session override.
@@ -173,7 +184,7 @@ module Mongoid
     #
     # @since 3.0.0
     def session_override=(name)
-      Thread.current["[mongoid]:session-override"] = name
+      Thread.current[SESSION_OVERRIDE_KEY] = name
     end
 
     # Get the mongoid scope stack for chained criteria.
@@ -185,7 +196,7 @@ module Mongoid
     #
     # @since 2.1.0
     def scope_stack
-      Thread.current["[mongoid]:scope-stack"] ||= {}
+      Thread.current[SCOPE_STACK_KEY] ||= {}
     end
 
     # Is the document autosaved on the current thread?
@@ -199,7 +210,7 @@ module Mongoid
     #
     # @since 2.1.9
     def autosaved?(document)
-      autosaves_for(document.class).include?(document.id)
+      autosaves_for(document.class).include?(document._id)
     end
 
     # Is the document validated on the current thread?
@@ -213,7 +224,7 @@ module Mongoid
     #
     # @since 2.1.9
     def validated?(document)
-      validations_for(document.class).include?(document.id)
+      validations_for(document.class).include?(document._id)
     end
 
     # Get all autosaves on the current thread.
@@ -225,7 +236,7 @@ module Mongoid
     #
     # @since 3.0.0
     def autosaves
-      Thread.current["[mongoid]:autosaves"] ||= {}
+      Thread.current[AUTOSAVES_KEY] ||= {}
     end
 
     # Get all validations on the current thread.
@@ -237,7 +248,7 @@ module Mongoid
     #
     # @since 2.1.9
     def validations
-      Thread.current["[mongoid]:validations"] ||= {}
+      Thread.current[VALIDATIONS_KEY] ||= {}
     end
 
     # Get all autosaves on the current thread for the class.

data/lib/mongoid/traversable.rb

@@ -7,8 +7,12 @@ module Mongoid
   module Traversable
     extend ActiveSupport::Concern
 
-    included do
-      attr_accessor :_parent
+    def _parent
+      @__parent
+    end
+
+    def _parent=(p)
+      @__parent = p
     end
 
     # Get all child +Documents+ to this +Document+, going n levels deep if

data/lib/mongoid/validatable/uniqueness.rb

@@ -130,7 +130,7 @@ module Mongoid
         end
 
         if document.persisted? && !document.embedded?
-          selector.merge!(_id: { "$ne" => document.id })
+          selector.merge!(_id: { "$ne" => document._id })
         end
         selector
       end
@@ -164,7 +164,7 @@ module Mongoid
       # @return [ Criteria ] The scoped criteria.
       #
       # @since 2.3.0
-      def scope(criteria, document, attribute)
+      def scope(criteria, document, _attribute)
         Array.wrap(options[:scope]).each do |item|
           name = document.database_field_name(item)
           criteria = criteria.where(item => document.attributes[name])
@@ -227,7 +227,7 @@ module Mongoid
       def to_validate(document, attribute, value)
         metadata = document.relations[attribute.to_s]
         if metadata && metadata.stores_foreign_key?
-          [ metadata.foreign_key, value && value.id ]
+          [ metadata.foreign_key, value && value._id ]
         else
           [ attribute, value ]
         end

data/lib/mongoid/version.rb

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

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -27,12 +27,44 @@ development:
         # The time in seconds that Moped should wait before retrying an
         # operation on failure. (default: 0.25)
         # retry_interval: 0.25
+        
+        # The connection pool size per-node.  This should match or exceed the
+        # number of threads for a multi-threaded application. (default: 5)
+        # pool_size: 5
+        
+        # The time in seconds that Moped should wait for the pool to provide
+        # an available connection.  This number should probably remain at the 
+        # default, unless for some reason you absolutely need to limit the
+        # pool_size, as this wait is only used when the pool is saturated.
+        # (default: 0.5)
+        # pool_timeout: 0.5
+
+        # The time in seconds before Moped will timeout connection and node
+        # operations. (default: 5)
+        # timeout: 5
+        
+        # The amount of time in seconds between forced refreshes of node 
+        # information including the discovery of new peers. (default: 300)
+        # refresh_interval: 300
+        
+        # The amount of time in seconds that a node will be flagged as down.
+        # (default: 30) 
+        # down_interval: 30
+        
+        # Whether connections should use SSL. (default: nil/false)
+        # ssl: false
+        
+        # Whether Moped will use the existing seeds/nodes to find other peers.
+        # (default: true)
+        # auto_discover: true
+
+
   # Configure Mongoid specific options. (optional)
   options:
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 
-    # Include the _type field in serializaion. (default: false)
+    # Include the _type field in serialization. (default: false)
     # include_type_for_serialization: false
 
     # Preload all models in development, needed when models use

data/spec/app/models/contextable_item.rb

@@ -0,0 +1,5 @@
+class ContextableItem
+  include Mongoid::Document
+  field :title
+  validates :title, presence: true, on: :in_context
+end

data/spec/app/models/id_key.rb

@@ -0,0 +1,6 @@
+class IdKey
+  include Mongoid::Document
+  field :key
+  alias_method :id,  :key
+  alias_method :id=, :key=
+end