mongoid 7.0.0.beta → 7.0.0

data/lib/mongoid/criteria/queryable/extensions/string.rb

@@ -29,7 +29,7 @@ module Mongoid
           #
           # @since 1.0.0
           def __evolve_time__
-            ::Time.parse(self).utc
+            __mongoize_time__.utc
           end
 
           # Get the string as a mongo expression, adding $ to the front.

data/lib/mongoid/criteria/queryable/mergeable.rb

@@ -259,7 +259,9 @@ module Mongoid
         def prepare(field, operator, value)
           unless operator =~ /exists|type|size/
             value = value.__expand_complex__
-            serializer = serializers[field]
+            field = field.to_s
+            name = aliases[field] || field
+            serializer = serializers[name]
             value = serializer ? serializer.evolve(value) : value
           end
           selection = { operator => value }

data/lib/mongoid/errors.rb

@@ -20,6 +20,7 @@ require "mongoid/errors/invalid_persistence_option"
 require "mongoid/errors/invalid_relation"
 require "mongoid/errors/invalid_relation_option"
 require "mongoid/errors/invalid_scope"
+require "mongoid/errors/invalid_session_use"
 require "mongoid/errors/invalid_set_polymorphic_relation"
 require "mongoid/errors/invalid_storage_options"
 require "mongoid/errors/invalid_storage_parent"

data/lib/mongoid/errors/invalid_session_use.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Mongoid
+  module Errors
+
+    # This error is raised when a session is attempted to be used with a model whose client cannot use it, if
+    #   sessions are nested, or if the mongodb deployment doesn't support sessions.
+    #
+    # @since 6.4.0
+    class InvalidSessionUse < MongoidError
+
+      # Create the error.
+      #
+      # @example Create the error.
+      #   InvalidSessionUse.new(:invalid_session_use)
+      #
+      # @param [ :invalid_sesion_use, :invalid_session_nesting ] error_type The type of session misuse.
+      #
+      # @since 6.4.0
+      def initialize(error_type)
+        super(compose_message(error_type.to_s))
+      end
+    end
+  end
+end

data/lib/mongoid/extensions.rb

@@ -5,10 +5,6 @@ class BSON::ObjectId
   end
 end
 
-class Symbol
-  remove_method :size if instance_methods.include? :size # temporal fix for ruby 1.9
-end
-
 class BSON::Document
   # We need to override this as ActiveSupport creates a new Object, instead of a new Hash
   # see https://github.com/rails/rails/commit/f1bad130d0c9bd77c94e43b696adca56c46a66aa

data/lib/mongoid/extensions/hash.rb

@@ -106,8 +106,11 @@ module Mongoid
         value = self
         keys.each do |key|
           return nil if value.nil?
-          nested = value[key] || value[key.to_i]
-          value = nested
+          value_for_key = value[key]
+          if value_for_key.nil? && key.to_i.to_s == key
+            value_for_key = value[key.to_i]
+          end
+          value = value_for_key
         end
         value
       end

data/lib/mongoid/factory.rb

@@ -17,7 +17,8 @@ module Mongoid
     #
     # @return [ Document ] The instantiated document.
     def build(klass, attributes = nil)
-      type = (attributes || {})[TYPE]
+      attributes ||= {}
+      type = attributes[TYPE] || attributes[TYPE.to_sym]
       if type && klass._types.include?(type)
         type.constantize.new(attributes)
       else
@@ -37,14 +38,22 @@ module Mongoid
     #   #only we give the document a list of the selected fields.
     #
     # @return [ Document ] The instantiated document.
-    def from_db(klass, attributes = nil, selected_fields = nil)
+    def from_db(klass, attributes = nil, criteria = nil)
+      selected_fields = criteria.options[:fields] if criteria
       type = (attributes || {})[TYPE]
       if type.blank?
-        klass.instantiate(attributes, selected_fields)
+        obj = klass.instantiate(attributes, selected_fields)
+        if criteria && criteria.association && criteria.parent_document
+          obj.set_relation(criteria.association.inverse, criteria.parent_document)
+        end
+        obj
       else
         camelized = type.camelize
-        raise Errors::UnknownModel.new(camelized, type) unless Object.const_defined?(camelized)
-        camelized.constantize.instantiate(attributes, selected_fields)
+        begin
+          camelized.constantize.instantiate(attributes, selected_fields)
+        rescue NameError
+          raise Errors::UnknownModel.new(camelized, type)
+        end
       end
     end
   end

data/lib/mongoid/fields.rb

@@ -411,7 +411,7 @@ module Mongoid
       def create_field_getter(name, meth, field)
         generated_methods.module_eval do
           re_define_method(meth) do
-            raw = read_attribute(name)
+            raw = read_raw_attribute(name)
             if lazy_settable?(field, raw)
               write_attribute(name, field.eval_default(self))
             else
@@ -480,7 +480,7 @@ module Mongoid
       def create_field_check(name, meth)
         generated_methods.module_eval do
           re_define_method("#{meth}?") do
-            value = read_attribute(name)
+            value = read_raw_attribute(name)
             lookup_attribute_presence(name, value)
           end
         end

data/lib/mongoid/indexable.rb

@@ -35,10 +35,10 @@ module Mongoid
           key, options = spec.key, default_options.merge(spec.options)
           if database = options[:database]
             with(database: database) do |klass|
-              klass.collection.indexes.create_one(key, options.except(:database))
+              klass.collection.indexes(session: session).create_one(key, options.except(:database))
             end
           else
-            collection.indexes.create_one(key, options)
+            collection.indexes(session: session).create_one(key, options)
           end
         end and true
       end
@@ -56,9 +56,9 @@ module Mongoid
         indexed_database_names.each do |database|
           with(database: database) do |klass|
             begin
-              klass.collection.indexes.each do |spec|
+              klass.collection.indexes(session: session).each do |spec|
                 unless spec["name"] == "_id_"
-                  klass.collection.indexes.drop_one(spec["key"])
+                  klass.collection.indexes(session: session).drop_one(spec["key"])
                   logger.info(
                     "MONGOID: Removed index '#{spec["name"]}' on collection " +
                     "'#{klass.collection.name}' in database '#{database}'."

data/lib/mongoid/matchable/and.rb

@@ -2,7 +2,7 @@
 module Mongoid
   module Matchable
 
-    # Defines behavior for handling $or expressions in embedded documents.
+    # Defines behavior for handling $and expressions in embedded documents.
     class And < Default
 
       # Does the supplied query match the attribute?

data/lib/mongoid/matchable/elem_match.rb

@@ -13,13 +13,19 @@ module Mongoid
       #
       # @return [ true, false ] If the values match.
       def _matches?(value)
-        if !@attribute.is_a?(Array) || !value.kind_of?(Hash) || !value["$elemMatch"].kind_of?(Hash)
+        elem_match = value["$elemMatch"] || value[:$elemMatch]
+
+        if !@attribute.is_a?(Array) || !value.kind_of?(Hash) || !elem_match.kind_of?(Hash)
           return false
         end
 
         return @attribute.any? do |sub_document|
-          value["$elemMatch"].all? do |k, v|
-            Matchable.matcher(sub_document, k, v)._matches?(v)
+          elem_match.all? do |k, v|
+            if v.try(:first).try(:[],0) == "$not".freeze || v.try(:first).try(:[],0) == :$not
+              !Matchable.matcher(sub_document, k, v.first[1])._matches?(v.first[1])
+            else
+              Matchable.matcher(sub_document, k, v)._matches?(v)
+            end
           end
         end
       end

data/lib/mongoid/persistable.rb

@@ -201,9 +201,9 @@ module Mongoid
     #
     # @since 4.0.0
     def persist_atomic_operations(operations)
-      if persisted? && operations
+      if persisted? && operations && !operations.empty?
         selector = atomic_selector
-        _root.collection.find(selector).update_one(positionally(selector, operations))
+        _root.collection.find(selector).update_one(positionally(selector, operations), session: session)
       end
     end
   end

data/lib/mongoid/persistable/creatable.rb

@@ -61,7 +61,9 @@ module Mongoid
           _parent.insert
         else
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update_one(positionally(selector, atomic_inserts))
+          _root.collection.find(selector).update_one(
+              positionally(selector, atomic_inserts),
+              session: session)
         end
       end
 
@@ -76,7 +78,7 @@ module Mongoid
       #
       # @since 4.0.0
       def insert_as_root
-        collection.insert_one(as_attributes)
+        collection.insert_one(as_attributes, session: session)
       end
 
       # Post process an insert, which sets the new record attribute to false

data/lib/mongoid/persistable/deletable.rb

@@ -64,7 +64,9 @@ module Mongoid
         _parent.remove_child(self) if notifying_parent?(options)
         if _parent.persisted?
           selector = _parent.atomic_selector
-          _root.collection.find(selector).update_one(positionally(selector, atomic_deletes))
+          _root.collection.find(selector).update_one(
+              positionally(selector, atomic_deletes),
+              session: session)
         end
         true
       end
@@ -80,7 +82,7 @@ module Mongoid
       #
       # @since 4.0.0
       def delete_as_root
-        collection.find(atomic_selector).delete_one
+        collection.find(atomic_selector).delete_one(session: session)
         true
       end
 

data/lib/mongoid/persistable/destroyable.rb

@@ -48,11 +48,7 @@ module Mongoid
         #
         # @since 1.0.0
         def destroy_all(conditions = nil)
-          selector = conditions || {}
-          documents = where(selector)
-          destroyed = documents.count
-          documents.each { |doc| doc.destroy }
-          destroyed
+          where(conditions || {}).destroy
         end
       end
     end

data/lib/mongoid/persistable/updatable.rb

@@ -134,9 +134,9 @@ module Mongoid
           unless updates.empty?
             coll = collection(_root)
             selector = atomic_selector
-            coll.find(selector).update_one(positionally(selector, updates))
+            coll.find(selector).update_one(positionally(selector, updates), session: session)
             conflicts.each_pair do |key, value|
-              coll.find(selector).update_one(positionally(selector, { key => value }))
+              coll.find(selector).update_one(positionally(selector, { key => value }), session: session)
             end
           end
         end

data/lib/mongoid/persistable/upsertable.rb

@@ -21,7 +21,8 @@ module Mongoid
       # @since 3.0.0
       def upsert(options = {})
         prepare_upsert(options) do
-          collection.find(atomic_selector).update_one(as_attributes, upsert: true)
+          collection.find(atomic_selector).update_one(
+              as_attributes, upsert: true, session: session)
         end
       end
 

data/lib/mongoid/persistence_context.rb

@@ -195,10 +195,10 @@ module Mongoid
         Thread.current["[mongoid][#{object.object_id}]:context"]
       end
 
-      # Get the persistence context for a particular class or model instance.
+      # Clear the persistence context for a particular class or model instance.
       #
-      # @example Get the persistence context for a class or model instance.
-      #  PersistenceContext.get(model)
+      # @example Clear the persistence context for a class or model instance.
+      #  PersistenceContext.clear(model)
       #
       # @param [ Class, Object ] object The class or model instance.
       # @param [ Mongo::Cluster ] cluster The original cluster before this context was used.
@@ -208,8 +208,9 @@ module Mongoid
         if context = get(object)
           context.client.close unless (context.cluster.equal?(cluster) || cluster.nil?)
         end
+      ensure  
         Thread.current["[mongoid][#{object.object_id}]:context"] = nil
       end
     end
   end
-end
+end

data/lib/mongoid/query_cache.rb

@@ -222,9 +222,11 @@ module Mongoid
           super
         else
           unless cursor = cached_cursor
-            server = read.select_server(cluster)
-            cursor = CachedCursor.new(view, send_initial_query(server), server)
-            QueryCache.cache_table[cache_key] = cursor
+            read_with_retry do
+              server = server_selector.select_server(cluster)
+              cursor = CachedCursor.new(view, send_initial_query(server), server)
+              QueryCache.cache_table[cache_key] = cursor
+            end
           end
           cursor.each do |doc|
             yield doc

data/lib/mongoid/reloadable.rb

@@ -58,7 +58,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(collection.find(_id: _id).read(mode: :primary).first || {})
+      {}.merge(collection.find({ _id: _id }, session: session).read(mode: :primary).first || {})
     end
 
     # Reload the embedded document.

data/lib/mongoid/serializable.rb

@@ -101,7 +101,7 @@ module Mongoid
         value = send(name)
         attrs[name] = value ? value.serializable_hash(options) : nil
       elsif names.include?(name) && !fields.key?(name)
-        attrs[name] = read_attribute(name)
+        attrs[name] = read_raw_attribute(name)
       elsif !attribute_missing?(name)
         attrs[name] = send(name)
       end

data/lib/mongoid/shardable.rb

@@ -37,7 +37,7 @@ module Mongoid
     def shard_key_selector
       selector = {}
       shard_key_fields.each do |field|
-        selector[field.to_s] = send(field)
+        selector[field.to_s] = new_record? ? send(field) : attribute_was(field)
       end
       selector
     end

data/lib/mongoid/tasks/database.rb

@@ -44,7 +44,7 @@ module Mongoid
         models.each do |model|
           unless model.embedded?
             begin
-              model.collection.indexes.each do |index|
+              model.collection.indexes(session: model.send(:session)).each do |index|
                 # ignore default index
                 unless index['name'] == '_id_'
                   key = index['key'].symbolize_keys
@@ -77,7 +77,7 @@ module Mongoid
           indexes.each do |index|
             key = index['key'].symbolize_keys
             collection = model.collection
-            collection.indexes.drop_one(key)
+            collection.indexes(session: model.send(:session)).drop_one(key)
             logger.info(
               "MONGOID: Removed index '#{index['name']}' on collection " +
               "'#{collection.name}' in database '#{collection.database.name}'."
@@ -107,6 +107,7 @@ module Mongoid
       end
 
       private
+
       def logger
         Mongoid.logger
       end

data/lib/mongoid/threaded.rb

@@ -325,5 +325,43 @@ module Mongoid
     def validations_for(klass)
       validations[klass] ||= []
     end
+
+    # Cache a session for this thread.
+    #
+    # @example Save a session for this thread.
+    #   Threaded.set_session(session)
+    #
+    # @param [ Mongo::Session ] session The session to save.
+    #
+    # @since 6.4.0
+    def set_session(session)
+      Thread.current[:session] = session
+    end
+
+    # Get the cached session for this thread.
+    #
+    # @example Get the session for this thread.
+    #   Threaded.get_session
+    #
+    # @return [ Mongo::Session, nil ] The session cached on this thread or nil.
+    #
+    # @since 6.4.0
+    def get_session
+      Thread.current[:session]
+    end
+
+    # Clear the cached session for this thread.
+    #
+    # @example Clear this thread's session.
+    #   Threaded.clear_session
+    #
+    # @return [ nil ]
+    #
+    # @since 6.4.0
+    def clear_session
+      session = get_session
+      session.end_session if session
+      Thread.current[:session] = nil
+    end
   end
 end

data/lib/mongoid/traversable.rb

@@ -8,7 +8,7 @@ module Mongoid
     extend ActiveSupport::Concern
 
     def _parent
-      @__parent
+      @__parent ||= nil
     end
 
     def _parent=(p)

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "7.0.0.beta"
+  VERSION = "7.0.0"
 end

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

@@ -11,6 +11,10 @@ development:
       hosts:
         - localhost:27017
       options:
+        # Note that all options listed below are Ruby driver client options (the mongo gem).
+        # Please refer to the driver documentation of the version of the mongo gem you are using
+        # for the most up-to-date list of options.
+        #
         # Change the default write concern. (default = { w: 1 })
         # write:
         #   w: 1