mongoid 4.0.2 → 5.0.0.beta

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"
@@ -60,7 +58,7 @@ 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
             handle_configuration_error(e)
@@ -95,24 +93,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/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/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/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
 

data/lib/mongoid/scopable.rb

@@ -31,7 +31,7 @@ module Mongoid
     def apply_default_scoping
       if default_scoping
         default_scoping.call.selector.each do |field, value|
-          attributes[field] = value unless value.respond_to?(:each_pair)
+          attributes[field] = value unless value.respond_to?(:each)
         end
       end
     end
@@ -115,7 +115,7 @@ module Mongoid
       #
       # @since 3.0.0
       def queryable
-        scope_stack.last || Criteria.new(self)
+        Threaded.current_scope || Criteria.new(self)
       end
 
       # Create a scope that can be accessed from the class level or chained to
@@ -150,18 +150,6 @@ module Mongoid
         define_scope_method(normalized)
       end
 
-      # Initializes and returns the current scope stack.
-      #
-      # @example Get the scope stack.
-      #   Person.scope_stack
-      #
-      # @return [ Array<Criteria> ] The scope stack.
-      #
-      # @since 1.0.0
-      def scope_stack
-        Threaded.scope_stack[object_id] ||= []
-      end
-
       # Get a criteria for the document with normal scoping.
       #
       # @example Get the criteria.
@@ -234,11 +222,11 @@ module Mongoid
       #
       # @since 1.0.0
       def with_scope(criteria)
-        scope_stack.push(criteria)
+        Threaded.current_scope = criteria
         begin
           yield criteria
         ensure
-          scope_stack.pop
+          Threaded.current_scope = nil
         end
       end
 
@@ -325,7 +313,8 @@ module Mongoid
         singleton_class.class_eval do
           define_method name do |*args|
             scoping = _declared_scopes[name]
-            scope, extension = scoping[:scope][*args], scoping[:extension]
+            scope = instance_exec(*args, &scoping[:scope])
+            extension = scoping[:extension]
             criteria = with_default_scope.merge(scope || queryable)
             criteria.extend(extension)
             criteria

data/lib/mongoid/selectable.rb

@@ -18,42 +18,7 @@ module Mongoid
     #
     # @since 1.0.0
     def atomic_selector
-      @atomic_selector ||=
-        (embedded? ? embedded_atomic_selector : root_atomic_selector)
-    end
-
-    private
-
-    # Get the atomic selector for an embedded document.
-    #
-    # @api private
-    #
-    # @example Get the embedded atomic selector.
-    #   document.embedded_atomic_selector
-    #
-    # @return [ Hash ] The embedded document selector.
-    #
-    # @since 4.0.0
-    def embedded_atomic_selector
-      if persisted? && _id_changed?
-        _parent.atomic_selector
-      else
-        _parent.atomic_selector.merge("#{atomic_path}._id" => _id)
-      end
-    end
-
-    # Get the atomic selector for a root document.
-    #
-    # @api private
-    #
-    # @example Get the root atomic selector.
-    #   document.root_atomic_selector
-    #
-    # @return [ Hash ] The root document selector.
-    #
-    # @since 4.0.0
-    def root_atomic_selector
-      { "_id" => _id }.merge!(shard_key_selector)
+      @atomic_selector ||= { "_id" => _root._id }.merge!(shard_key_selector)
     end
   end
 end

data/lib/mongoid/serializable.rb

@@ -97,10 +97,10 @@ module Mongoid
     #
     # @since 3.0.0
     def serialize_attribute(attrs, name, names, options)
-      if relations.has_key?(name)
+      if relations.key?(name)
         value = send(name)
         attrs[name] = value ? value.serializable_hash(options) : nil
-      elsif names.include?(name) && !fields.has_key?(name)
+      elsif names.include?(name) && !fields.key?(name)
         attrs[name] = read_attribute(name)
       elsif !attribute_missing?(name)
         attrs[name] = send(name)

data/lib/mongoid/stateful.rb

@@ -55,7 +55,6 @@ module Mongoid
     def destroyed?
       @destroyed ||= false
     end
-    alias :deleted? :destroyed?
 
     # Determine if the document can be pushed.
     #

data/lib/mongoid/tasks/database.rake

@@ -18,9 +18,9 @@ namespace :db do
       ::Mongoid::Tasks::Database.remove_indexes
     end
 
-    desc "Drops the default session"
+    desc "Drops the default client database"
     task :drop => :environment do
-      ::Mongoid::Sessions.default.drop
+      ::Mongoid::Clients.default.database.drop
     end
 
     desc "Drop all collections except the system collections"

data/lib/mongoid/tasks/database.rb

@@ -42,18 +42,20 @@ module Mongoid
 
         models.each do |model|
           unless model.embedded?
-            model.collection.indexes.each do |index|
-              # ignore default index
-              unless index['name'] == '_id_'
-                key = index['key'].symbolize_keys
-                spec = model.index_specification(key)
-                unless spec
-                  # index not specified
-                  undefined_by_model[model] ||= []
-                  undefined_by_model[model] << index
+            begin
+              model.collection.indexes.each do |index|
+                # ignore default index
+                unless index['name'] == '_id_'
+                  key = index['key'].symbolize_keys
+                  spec = model.index_specification(key)
+                  unless spec
+                    # index not specified
+                    undefined_by_model[model] ||= []
+                    undefined_by_model[model] << index
+                  end
                 end
               end
-            end
+            rescue Mongo::Error::OperationFailure; end
           end
         end
 
@@ -73,8 +75,12 @@ module Mongoid
         undefined_indexes(models).each do |model, indexes|
           indexes.each do |index|
             key = index['key'].symbolize_keys
-            model.collection.indexes.drop(key)
-            logger.info("MONGOID: Removing index: #{index['name']} on #{model}.")
+            collection = model.collection
+            collection.indexes.drop_one(key)
+            logger.info(
+              "MONGOID: Removed index '#{index['name']}' on collection " +
+              "'#{collection.name}' in database '#{collection.database.name}'."
+            )
           end
         end
       end
@@ -90,10 +96,11 @@ module Mongoid
       def remove_indexes(models = ::Mongoid.models)
         models.each do |model|
           next if model.embedded?
-          indexes = model.collection.indexes.map{ |doc| doc["name"] }
-          indexes.delete_one("_id_")
-          model.remove_indexes
-          logger.info("MONGOID: Removing indexes on: #{model} for: #{indexes.join(', ')}.")
+          begin
+            model.remove_indexes
+          rescue Mongo::Error::OperationFailure
+            next
+          end
           model
         end.compact
       end