mongoid 4.0.2 → 5.0.0

data/lib/mongoid/persistable/unsettable.rb

@@ -17,7 +17,7 @@ module Mongoid
       # @param [ Array<String, Symbol> ] fields The names of the fields to
       #   unset.
       #
-      # @return [ true ] If the operation succeeded.
+      # @return [ Document ] The document.
       #
       # @since 4.0.0
       def unset(*fields)

data/lib/mongoid/persistable/updatable.rb

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

data/lib/mongoid/persistable/upsertable.rb

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

data/lib/mongoid/persistable.rb

@@ -27,7 +27,6 @@ module Mongoid
     include Incrementable
     include Logical
     include Poppable
-    include Positional
     include Pullable
     include Pushable
     include Renamable
@@ -209,7 +208,7 @@ module Mongoid
     def persist_atomic_operations(operations)
       if persisted?
         selector = atomic_selector
-        _root.collection.find(selector).update(positionally(selector, operations))
+        _root.collection.find(selector).update_one(operations)
       end
     end
   end

data/lib/mongoid/query_cache.rb

@@ -107,149 +107,143 @@ module Mongoid
       end
     end
 
-    module Base # :nodoc:
-
-      def alias_query_cache_clear(*method_names)
-        method_names.each do |method_name|
-          class_eval <<-CODE, __FILE__, __LINE__ + 1
-              def #{method_name}_with_clear_cache(*args)   # def upsert_with_clear_cache(*args)
-                QueryCache.clear_cache                     #   QueryCache.clear_cache
-                #{method_name}_without_clear_cache(*args)  #   upsert_without_clear_cache(*args)
-              end                                          # end
-            CODE
+    # A Cursor that attempts to load documents from memory first before hitting
+    # the database if the same query has already been executed.
+    #
+    # @since 5.0.0
+    class CachedCursor < Mongo::Cursor
 
-          alias_method_chain method_name, :clear_cache
+      # We iterate over the cached documents if they exist already in the
+      # cursor otherwise proceed as normal.
+      #
+      # @example Iterate over the documents.
+      #   cursor.each do |doc|
+      #     # ...
+      #   end
+      #
+      # @since 5.0.0
+      def each
+        if @cached_documents
+          @cached_documents.each{ |doc| yield doc }
+        else
+          super
         end
       end
+
+      # Get a human-readable string representation of +Cursor+.
+      #
+      # @example Inspect the cursor.
+      #   cursor.inspect
+      #
+      # @return [ String ] A string representation of a +Cursor+ instance.
+      #
+      # @since 2.0.0
+      def inspect
+        "#<Mongoid::QueryCache::CachedCursor:0x#{object_id} @view=#{@view.inspect}>"
+      end
+
+      private
+
+      def process(result)
+        @remaining -= result.returned_count if limited?
+        @cursor_id = result.cursor_id
+        @coll_name ||= result.namespace.sub("#{database.name}.", '') if result.namespace
+        documents = result.documents
+        (@cached_documents ||= []).concat(documents)
+        documents
+      end
     end
 
-    # Module to include in objects which need to wrap caching behaviour around
-    # them.
+    # Included to add behaviour for clearing out the query cache on certain
+    # operations.
     #
     # @since 4.0.0
-    module Cacheable
+    module Base
 
-      private
+      def alias_query_cache_clear(*method_names)
+        method_names.each do |method_name|
+          class_eval <<-CODE, __FILE__, __LINE__ + 1
+              def #{method_name}_with_clear_cache(*args)
+                QueryCache.clear_cache
+                #{method_name}_without_clear_cache(*args)
+              end
+            CODE
 
-      def with_cache(context = :cursor, more = false, &block)
-        return yield unless QueryCache.enabled?
-        return yield if system_collection?
-        key = cache_key.push(context)
-
-        if more
-          docs = yield
-          QueryCache.cache_table[key].push(*docs)
-          docs
-        elsif QueryCache.cache_table.has_key?(key)
-          instrument(key) { QueryCache.cache_table[key] }
-        else
-          QueryCache.cache_table[key] = yield
+          alias_method_chain method_name, :clear_cache
         end
       end
-
-      def instrument(key, &block)
-        ActiveSupport::Notifications.instrument("query_cache.mongoid", key: key, &block)
-      end
     end
 
-    # Adds behaviour around caching to a Moped Query object.
+    # Contains enhancements to the Mongo::Collection::View in order to get a
+    # cached cursor or a regular cursor on iteration.
     #
-    # @since 4.0.0
-    module Query
+    # @since 5.0.0
+    module View
       extend ActiveSupport::Concern
-      include Cacheable
 
       included do
         extend QueryCache::Base
-        alias_method_chain :cursor, :cache
-        alias_method_chain :first, :cache
-        alias_query_cache_clear :remove, :remove_all, :update, :update_all, :upsert
-      end
-
-      # Provide a wrapped query cache cursor.
-      #
-      # @example Get the wrapped caching cursor.
-      #   query.cursor_with_cache
-      #
-      # @return [ CachedCursor ] The cached cursor.
-      #
-      # @since 4.0.0
-      def cursor_with_cache
-        CachedCursor.new(session, operation)
-      end
-
-      # Override first with caching.
-      #
-      # @example Get the first with a cache.
-      #   query.first_with_cache
-      #
-      # @return [ Hash ] The first document.
-      #
-      # @since 4.0.0
-      def first_with_cache
-        with_cache(:first) do
-          first_without_cache
+        alias_query_cache_clear :delete_one,
+                                :delete_many,
+                                :update_one,
+                                :update_many,
+                                :replace_one,
+                                :find_one_and_delete,
+                                :find_one_and_replace,
+                                :find_one_and_update
+      end
+
+      # Override the default enumeration to handle if the cursor can be cached
+      # or not.
+      #
+      # @example Iterate over the view.
+      #   view.each do |doc|
+      #     # ...
+      #   end
+      #
+      # @since 5.0.0
+      def each
+        if system_collection? || !QueryCache.enabled?
+          super
+        else
+          key = cache_key
+          cursor = QueryCache.cache_table[key]
+          unless cursor
+            server = read.select_server(cluster)
+            cursor = CachedCursor.new(view, send_initial_query(server), server)
+            QueryCache.cache_table[key] = cursor
+          end
+          cursor.each do |doc|
+            yield doc
+          end if block_given?
+          cursor
         end
       end
 
       private
 
       def cache_key
-        [ operation.database, operation.collection, operation.selector, operation.limit, operation.skip, operation.fields ]
+        [ collection.namespace, selector, limit, skip, projection ]
       end
 
       def system_collection?
-        operation.collection =~ /^system./
+        collection.namespace =~ /^system./
       end
     end
 
     # Adds behaviour to the query cache for collections.
     #
-    # @since 4.0.0
+    # @since 5.0.0
     module Collection
       extend ActiveSupport::Concern
 
       included do
         extend QueryCache::Base
-        alias_query_cache_clear :insert
-      end
-    end
-
-    # A Cursor that attempts to load documents from memory first before hitting
-    # the database if the same query has already been executed.
-    #
-    # @since 4.0.0
-    class CachedCursor < Moped::Cursor
-      include Cacheable
-
-      # Override the loading of docs to attempt to fetch from the cache.
-      #
-      # @example Load the documents.
-      #   cursor.load_docs
-      #
-      # @return [ Array<Hash> ] The documents.
-      #
-      # @since 4.0.0
-      def load_docs
-        with_cache { super }
-      end
-
-      def get_more
-        with_cache(:cursor, true) { super }
-      end
-
-      private
-
-      def cache_key
-        [ @database, @collection, @selector, @options[:limit], @options[:skip], @options[:fields] ]
-      end
-
-      def system_collection?
-        @collection =~ /^system./
+        alias_query_cache_clear :insert_one, :insert_many
       end
     end
   end
 end
 
-Moped::Query.__send__(:include, Mongoid::QueryCache::Query)
-Moped::Collection.__send__(:include, Mongoid::QueryCache::Collection)
+Mongo::Collection.__send__(:include, Mongoid::QueryCache::Collection)
+Mongo::Collection::View.__send__(:include, Mongoid::QueryCache::View)

data/lib/mongoid/railtie.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require "mongoid"
-require "mongoid/config"
 require "mongoid/railties/document"
 require "rails"
 require "rails/mongoid"
@@ -44,7 +42,6 @@ module Rails
       #   module MyApplication
       #     class Application < Rails::Application
       #       config.mongoid.logger = Logger.new($stdout, :warn)
-      #       config.mongoid.persist_in_safe_mode = true
       #     end
       #   end
       #
@@ -60,13 +57,13 @@ module Rails
         if config_file.file?
           begin
             ::Mongoid.load!(config_file)
-          rescue ::Mongoid::Errors::NoSessionsConfig => e
+          rescue ::Mongoid::Errors::NoClientsConfig => e
             handle_configuration_error(e)
-          rescue ::Mongoid::Errors::NoDefaultSession => e
+          rescue ::Mongoid::Errors::NoDefaultClient => e
             handle_configuration_error(e)
-          rescue ::Mongoid::Errors::NoSessionDatabase => e
+          rescue ::Mongoid::Errors::NoClientDatabase => e
             handle_configuration_error(e)
-          rescue ::Mongoid::Errors::NoSessionHosts => e
+          rescue ::Mongoid::Errors::NoClientHosts => e
             handle_configuration_error(e)
           end
         end
@@ -95,24 +92,6 @@ module Rails
         end
       end
 
-      config.after_initialize do
-        # Unicorn clears the START_CTX when a worker is forked, so if we have
-        # data in START_CTX then we know we're being preloaded. Unicorn does
-        # not provide application-level hooks for executing code after the
-        # process has forked, so we reconnect lazily.
-        if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
-          ::Mongoid.default_session.disconnect if ::Mongoid.configured?
-        end
-
-        # Passenger provides the :starting_worker_process event for executing
-        # code after it has forked, so we use that and reconnect immediately.
-        if ::Mongoid::Config.running_with_passenger?
-          PhusionPassenger.on_event(:starting_worker_process) do |forked|
-            ::Mongoid.default_session.disconnect if forked
-          end
-        end
-      end
-
       # Rails runs all initializers first before getting into any generator
       # code, so we have no way in the intitializer to know if we are
       # generating a mongoid.yml. So instead of failing, we catch all the

data/lib/mongoid/railties/database.rake

@@ -67,7 +67,7 @@ namespace :db do
 
   namespace :mongoid do
     task :load_models do
-      ::Rails.application.eager_load! if defined?(Rails)
+      ::Rails.application.eager_load! if defined?(::Rails)
     end
   end
 end

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

@@ -20,8 +20,9 @@ module Mongoid
             binding do
               inverse_keys = doc.you_must(metadata.inverse_foreign_key)
               if inverse_keys
-                unless inverse_keys.include?(inverse_record_id(doc))
-                  inverse_keys.push(inverse_record_id(doc))
+                record_id = inverse_record_id(doc)
+                unless inverse_keys.include?(record_id)
+                  doc.you_must(metadata.inverse_foreign_key_setter, inverse_keys.push(record_id))
                 end
                 doc.reset_relation_criteria(metadata.inverse)
               end

data/lib/mongoid/relations/builders.rb

@@ -91,7 +91,9 @@ module Mongoid
           re_define_method("create_#{name}") do |*args|
             attributes, options = parse_args(*args)
             document = Factory.build(metadata.klass, attributes)
-            doc = send("#{name}=", document)
+            doc = _assigning do
+              send("#{name}=", document)
+            end
             doc.save
             save if new_record? && metadata.stores_foreign_key?
             doc

data/lib/mongoid/relations/counter_cache.rb

@@ -116,7 +116,7 @@ module Mongoid
 
           before_destroy do
             if record = __send__(name)
-              record[cache_column] = (record[cache_column] || 0) - 1
+              record[cache_column] = (record[cache_column] || 0) - 1 unless record.frozen?
 
               if record.persisted?
                 record.class.decrement_counter(cache_column, record._id)

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

@@ -6,7 +6,6 @@ module Mongoid
       # Contains behaviour for executing operations in batch on embedded
       # documents.
       module Batchable
-        include Positional
 
         # Insert new documents as a batch push ($pushAll). This ensures that
         # all callbacks are run at the appropriate time and only 1 request is
@@ -37,9 +36,7 @@ module Mongoid
         def batch_clear(docs)
           pre_process_batch_remove(docs, :delete)
           unless docs.empty?
-            collection.find(selector).update(
-              positionally(selector, "$unset" => { path => true })
-            )
+            collection.find(selector).update_one("$unset" => { path => true })
             post_process_batch_remove(docs, :delete)
           end
           _unscoped.clear
@@ -57,9 +54,7 @@ module Mongoid
         def batch_remove(docs, method = :delete)
           removals = pre_process_batch_remove(docs, method)
           if !docs.empty?
-            collection.find(selector).update(
-              positionally(selector, "$pullAll" => { path => removals })
-            )
+            collection.find(selector).update_one("$pullAll" => { path => removals })
             post_process_batch_remove(docs, method)
           end
           reindex
@@ -130,9 +125,7 @@ module Mongoid
           self.inserts_valid = true
           inserts = pre_process_batch_insert(docs)
           if insertable?
-            collection.find(selector).update(
-              positionally(selector, operation => { path => inserts })
-            )
+            collection.find(selector).update_one(operation => { path => inserts })
             post_process_batch_insert(docs)
           end
           inserts

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

@@ -84,6 +84,7 @@ module Mongoid
           doc.apply_post_processed_defaults
           yield(doc) if block_given?
           doc.run_callbacks(:build) { doc }
+          base._reset_memoized_children!
           doc
         end
         alias :new :build
@@ -161,7 +162,7 @@ module Mongoid
         #
         # @example Delete the matching documents.
         #   person.addresses.delete_if do |doc|
-        #     doc.state = "GA"
+        #     doc.state == "GA"
         #   end
         #
         # @return [ Many, Enumerator ] The relation or an enumerator if no
@@ -170,7 +171,8 @@ module Mongoid
         # @since 3.1.0
         def delete_if
           if block_given?
-            target.each do |doc|
+            dup_target = target.dup
+            dup_target.each do |doc|
               delete(doc) if yield(doc)
             end
             self

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

@@ -20,6 +20,7 @@ module Mongoid
             characterize_one(target)
             bind_one
             characterize_one(target)
+            base._reset_memoized_children!
             target.save if persistable?
           end
         end

data/lib/mongoid/relations/many.rb

@@ -5,6 +5,7 @@ module Mongoid
     # This is the superclass for all many to one and many to many relation
     # proxies.
     class Many < Proxy
+      include ::Enumerable
 
       delegate :avg, :max, :min, :sum, to: :criteria
       delegate :length, :size, to: :target

data/lib/mongoid/relations/metadata.rb

@@ -459,6 +459,20 @@ module Mongoid
         @inverse_foreign_key ||= determine_inverse_foreign_key
       end
 
+      # Used for relational many to many only. This determines the name of the
+      # foreign key field setter on the inverse side of the relation, since in this
+      # case there are keys on both sides.
+      #
+      # @example Find the inverse foreign key setter.
+      #   metadata.inverse_foreign_key_setter
+      #
+      # @return [ String ] The foreign key setter on the inverse.
+      #
+      # @since 2.0.0.rc.1
+      def inverse_foreign_key_setter
+        @inverse_foreign_key_setter ||= "#{inverse_foreign_key}="
+      end
+
       # Returns the inverse class of the proxied relation.
       #
       # @example Get the inverse class.

data/lib/mongoid/relations/proxy.rb

@@ -12,7 +12,7 @@ module Mongoid
       # We undefine most methods to get them sent through to the target.
       instance_methods.each do |method|
         undef_method(method) unless
-          method =~ /(^__|^send|^object_id|^respond_to|^tap|extend_proxy|extend_proxies)/
+          method =~ /(^__|^send|^object_id|^respond_to|^tap|^public_send|extend_proxy|extend_proxies)/
       end
 
       include Threaded::Lifecycle
@@ -85,7 +85,7 @@ module Mongoid
       end
 
       # Tell the next persistance operation to store in a specific collection,
-      # database or session.
+      # database or client.
       #
       # @example Save the current document to a different collection.
       #   model.with(collection: "secondary").save
@@ -93,17 +93,17 @@ module Mongoid
       # @example Save the current document to a different database.
       #   model.with(database: "secondary").save
       #
-      # @example Save the current document to a different session.
-      #   model.with(session: "replica_set").save
+      # @example Save the current document to a different client.
+      #   model.with(client: "replica_set").save
       #
       # @example Save with a combination of options.
-      #   model.with(session: "sharded", database: "secondary").save
+      #   model.with(client: "sharded", database: "secondary").save
       #
       # @param [ Hash ] options The storage options.
       #
       # @option options [ String, Symbol ] :collection The collection name.
       # @option options [ String, Symbol ] :database The database name.
-      # @option options [ String, Symbol ] :session The session name.
+      # @option options [ String, Symbol ] :client The client name.
       #
       # @return [ Document ] The current document.
       #

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

@@ -320,6 +320,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def append(document)
+          # @todo: remove?
           document.with(@persistence_options) if @persistence_options
 
           execute_callback :before_add, document
@@ -428,7 +429,7 @@ module Mongoid
         # @since 3.0.0
         def persist_delayed(docs, inserts)
           unless docs.empty?
-            collection.insert(inserts)
+            collection.insert_many(inserts)
             docs.each do |doc|
               doc.new_record = false
               doc.run_after_callbacks(:create, :save)

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

@@ -45,7 +45,7 @@ module Mongoid
         #
         # @since 3.1.4
         def ===(other)
-          other.class == Class ? Array == other : self == other
+          other.class == Class ? (Array == other || Enumerable == other) : self == other
         end
 
         # Append a document to the enumerable.
@@ -175,7 +175,8 @@ module Mongoid
           end
           if _loaded?
             _loaded.each_pair do |id, doc|
-              yield(doc)
+              document = _added.delete(doc._id) || doc
+              yield(document)
             end
           else
             unloaded_documents.each do |doc|
@@ -217,7 +218,10 @@ module Mongoid
         #
         # @since 2.1.0
         def first
-          matching_document(:first)
+          _loaded.try(:values).try(:first) ||
+            _added[(ul = _unloaded.try(:first)).try(:id)] ||
+            ul ||
+            _added.values.try(:first)
         end
 
         # Initialize the new enumerable either with a criteria or an array.
@@ -298,7 +302,10 @@ module Mongoid
         #
         # @since 2.1.0
         def last
-          matching_document(:last)
+          _added.values.try(:last) ||
+            _loaded.try(:values).try(:last) ||
+            _added[(ul = _unloaded.try(:last)).try(:id)] ||
+            ul
         end
 
         # Loads all the documents in the enumerable from the database.
@@ -457,13 +464,6 @@ module Mongoid
           entries.send(name, *args, &block)
         end
 
-        def matching_document(location)
-          _loaded.try(:values).try(location) ||
-            _added[(ul = _unloaded.try(location)).try(:id)] ||
-            ul ||
-            _added.values.try(location)
-        end
-
         def unloaded_documents
           _unloaded.selector.values.any?(&:blank_criteria?) ? [] : _unloaded
         end

data/lib/mongoid/relations/touchable.rb

@@ -31,7 +31,7 @@ module Mongoid
         touches = touch_atomic_updates(field)
         unless touches.empty?
           selector = atomic_selector
-          _root.collection.where(selector).update(positionally(selector, touches))
+          _root.collection.find(selector).update_one(touches)
         end
         run_callbacks(:touch)
         true

data/lib/mongoid/reloadable.rb

@@ -57,7 +57,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(with(read: :primary).collection.find(_id: _id).one || {})
+      {}.merge(collection.find(_id: _id).read(mode: :primary).first || {})
     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.collection.find(_id: _root._id).read(mode: :primary).first
       ))
     end