mongoid 4.0.2 → 5.0.0

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,17 +96,18 @@ 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
 
       private
       def logger
-        @logger ||= Logger.new($stdout)
+        Mongoid.logger
       end
     end
   end

data/lib/mongoid/threaded/lifecycle.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 module Mongoid
   module Threaded
-
+    BIND = 'bind'.freeze
+    ASSIGN = 'assign'.freeze
+    BUILD = 'build'.freeze
+    LOAD = 'load'.freeze
+    CREATE = 'create'.freeze
+    
     # This module contains convenience methods for document lifecycle that
     # resides on thread locals.
     module Lifecycle
@@ -22,10 +27,10 @@ module Mongoid
       #
       # @since 2.2.0
       def _assigning
-        Threaded.begin_execution("assign")
+        Threaded.begin_execution(ASSIGN)
         yield
       ensure
-        Threaded.exit_execution("assign")
+        Threaded.exit_execution(ASSIGN)
       end
 
       # Is the current thread in assigning mode?
@@ -37,7 +42,7 @@ module Mongoid
       #
       # @since 2.1.0
       def _assigning?
-        Threaded.executing?("assign")
+        Threaded.executing?(ASSIGN)
       end
 
       # Execute a block in binding mode.
@@ -51,10 +56,10 @@ module Mongoid
       #
       # @since 2.1.0
       def _binding
-        Threaded.begin_execution("bind")
+        Threaded.begin_execution(BIND)
         yield
       ensure
-        Threaded.exit_execution("bind")
+        Threaded.exit_execution(BIND)
       end
 
       # Is the current thread in binding mode?
@@ -66,7 +71,7 @@ module Mongoid
       #
       # @since 2.1.0
       def _binding?
-        Threaded.executing?("bind")
+        Threaded.executing?(BIND)
       end
 
       # Execute a block in building mode.
@@ -80,10 +85,10 @@ module Mongoid
       #
       # @since 2.1.0
       def _building
-        Threaded.begin_execution("build")
+        Threaded.begin_execution(BUILD)
         yield
       ensure
-        Threaded.exit_execution("build")
+        Threaded.exit_execution(BUILD)
       end
 
       # Is the current thread in building mode?
@@ -95,7 +100,7 @@ module Mongoid
       #
       # @since 2.1.0
       def _building?
-        Threaded.executing?("build")
+        Threaded.executing?(BUILD)
       end
 
       # Is the current thread in creating mode?
@@ -107,7 +112,7 @@ module Mongoid
       #
       # @since 2.1.0
       def _creating?
-        Threaded.executing?("create")
+        Threaded.executing?(CREATE)
       end
 
       # Execute a block in loading mode.
@@ -121,10 +126,10 @@ module Mongoid
       #
       # @since 2.3.2
       def _loading
-        Threaded.begin_execution("load")
+        Threaded.begin_execution(LOAD)
         yield
       ensure
-        Threaded.exit_execution("load")
+        Threaded.exit_execution(LOAD)
       end
 
       # Is the current thread in loading mode?
@@ -136,7 +141,7 @@ module Mongoid
       #
       # @since 2.3.2
       def _loading?
-        Threaded.executing?("load")
+        Threaded.executing?(LOAD)
       end
 
       module ClassMethods
@@ -152,10 +157,10 @@ module Mongoid
         #
         # @since 2.1.0
         def _creating
-          Threaded.begin_execution("create")
+          Threaded.begin_execution(CREATE)
           yield
         ensure
-          Threaded.exit_execution("create")
+          Threaded.exit_execution(CREATE)
         end
 
       end

data/lib/mongoid/threaded.rb

@@ -6,10 +6,24 @@ 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"
+
+    # Constant for the key to store clients.
+    #
+    # @since 5.0.0
+    CLIENTS_KEY = "[mongoid]:clients"
+
+    # The key to override the client.
+    #
+    # @since 5.0.0
+    CLIENT_OVERRIDE_KEY = "[mongoid]:client-override"
+
+    # The key for the current thread's scope stack.
+    #
+    # @since 2.0.0
+    CURRENT_SCOPE_KEY = "[mongoid]:current-scope"
+
     AUTOSAVES_KEY = "[mongoid]:autosaves"
     VALIDATIONS_KEY = "[mongoid]:validations"
 
@@ -17,6 +31,7 @@ module Mongoid
       hash[key] = "[mongoid]:#{key}-stack"
     end
 
+    extend Gem::Deprecate
     extend self
 
     # Begin entry into a named thread local stack.
@@ -59,18 +74,6 @@ module Mongoid
       Thread.current[DATABASE_OVERRIDE_KEY] = name
     end
 
-    # Get the database sessions from the current thread.
-    #
-    # @example Get the database sessions.
-    #   Threaded.sessions
-    #
-    # @return [ Hash ] The sessions.
-    #
-    # @since 3.0.0
-    def sessions
-      Thread.current[SESSIONS_KEY] ||= {}
-    end
-
     # Are in the middle of executing the named stack
     #
     # @example Are we in the stack execution?
@@ -161,42 +164,60 @@ module Mongoid
       validations_for(document.class).delete_one(document._id)
     end
 
-    # Get the global session override.
+    # Get the global client override.
     #
-    # @example Get the global session override.
-    #   Threaded.session_override
+    # @example Get the global client override.
+    #   Threaded.client_override
     #
     # @return [ String, Symbol ] The override.
     #
-    # @since 3.0.0
-    def session_override
-      Thread.current[SESSION_OVERRIDE_KEY]
+    # @since 5.0.0
+    def client_override
+      Thread.current[CLIENT_OVERRIDE_KEY]
     end
+    alias :session_override :client_override
+    deprecate :session_override, :client_override, 2015, 12
 
-    # Set the global session override.
+    # Set the global client override.
     #
-    # @example Set the global session override.
-    #   Threaded.session_override = :testing
+    # @example Set the global client override.
+    #   Threaded.client_override = :testing
     #
     # @param [ String, Symbol ] The global override name.
     #
     # @return [ String, Symbol ] The override.
     #
     # @since 3.0.0
-    def session_override=(name)
-      Thread.current[SESSION_OVERRIDE_KEY] = name
+    def client_override=(name)
+      Thread.current[CLIENT_OVERRIDE_KEY] = name
+    end
+    alias :session_override= :client_override=
+    deprecate :session_override=, :client_override=, 2015, 12
+
+    # Get the current Mongoid scope.
+    #
+    # @example Get the scope.
+    #   Threaded.current_scope
+    #
+    # @return [ Criteria ] The scope.
+    #
+    # @since 5.0.0
+    def current_scope
+      Thread.current[CURRENT_SCOPE_KEY]
     end
 
-    # Get the mongoid scope stack for chained criteria.
+    # Set the current Mongoid scope.
+    #
+    # @example Set the scope.
+    #   Threaded.current_scope = scope
     #
-    # @example Get the scope stack.
-    #   Threaded.scope_stack
+    # @param [ Criteria ] scope The current scope.
     #
-    # @return [ Hash ] The scope stack.
+    # @return [ Criteria ] The scope.
     #
-    # @since 2.1.0
-    def scope_stack
-      Thread.current[SCOPE_STACK_KEY] ||= {}
+    # @since 5.0.0
+    def current_scope=(scope)
+      Thread.current[CURRENT_SCOPE_KEY] = scope
     end
 
     # Is the document autosaved on the current thread?

data/lib/mongoid/traversable.rb

@@ -124,6 +124,22 @@ module Mongoid
         child.move_changes
         child.new_record = false
       end
+      _reset_memoized_children!
+    end
+
+    # Resets the memoized children on the object. Called internally when an
+    # embedded array changes size.
+    #
+    # @api semiprivate
+    #
+    # @example Reset the memoized children.
+    #   document._reset_memoized_children!
+    #
+    # @return [ nil ] nil.
+    #
+    # @since 5.0.0
+    def _reset_memoized_children!
+      _parent._reset_memoized_children! if _parent
       @__children = nil
     end
 
@@ -161,7 +177,7 @@ module Mongoid
       #
       # @return [ true, false ] True if hereditary, false if not.
       def hereditary?
-        Mongoid::Document > superclass
+        !!(Mongoid::Document > superclass)
       end
 
       # When inheriting, we want to copy the fields from the parent class and

data/lib/mongoid/validatable/queryable.rb

@@ -4,7 +4,7 @@ module Mongoid
     module Queryable
 
       # Wrap the validation inside the an execution block that alert's the
-      # session not to clear its persistence options.
+      # client not to clear its persistence options.
       #
       # @example Execute the validation with a query.
       #   with_query(document) do

data/lib/mongoid/validatable/uniqueness.rb

@@ -122,8 +122,8 @@ module Mongoid
       def criterion(document, attribute, value)
         field = document.database_field_name(attribute)
 
-        if localized?(document, field)
-          conditions = value.inject([]) { |acc, (k,v)| acc << { "#{field}.#{k}" => filter(v) } }
+        if value && localized?(document, field)
+          conditions = (value || {}).inject([]) { |acc, (k,v)| acc << { "#{field}.#{k}" => filter(v) }}
           selector = { "$or" => conditions }
         else
           selector = { field => filter(value) }
@@ -274,7 +274,7 @@ module Mongoid
         criteria = create_criteria(klass, document, attribute, value)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 
-        if criteria.with(persistence_options(criteria)).exists?
+        if criteria.with(criteria.persistence_options).read(mode: :primary).exists?
           add_error(document, attribute, value)
         end
       end
@@ -296,23 +296,6 @@ module Mongoid
           scope_value_changed?(document)
       end
 
-      # Get the persistence options to perform to check, merging with any
-      # existing.
-      #
-      # @api private
-      #
-      # @example Get the persistence options.
-      #   validator.persistence_options(criteria)
-      #
-      # @param [ Criteria ] criteria The criteria.
-      #
-      # @return [ Hash ] The persistence options.
-      #
-      # @since 3.0.23
-      def persistence_options(criteria)
-        (criteria.persistence_options || {}).merge!(read: :primary)
-      end
-
       # Is the attribute localized?
       #
       # @api private

data/lib/mongoid/validatable.rb

@@ -68,7 +68,7 @@ module Mongoid
     # @since 2.0.0.rc.1
     def read_attribute_for_validation(attr)
       attribute = database_field_name(attr)
-      if relations.has_key?(attribute)
+      if relations.key?(attribute)
         begin_validate
         relation = without_autobuild { send(attr) }
         exit_validate

data/lib/mongoid/version.rb

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

data/lib/mongoid.rb

@@ -13,14 +13,13 @@ require "active_support/time_with_zone"
 require "active_model"
 
 require "origin"
-require "moped"
+require "mongo"
 
 require "mongoid/version"
 require "mongoid/config"
 require "mongoid/loggable"
-require "mongoid/sessions"
+require "mongoid/clients"
 require "mongoid/document"
-require "mongoid/log_subscriber"
 require "mongoid/tasks/database"
 require "mongoid/query_cache"
 
@@ -35,9 +34,11 @@ I18n.load_path << File.join(File.dirname(__FILE__), "config", "locales", "en.yml
 
 module Mongoid
   extend Loggable
+  extend Gem::Deprecate
   extend self
 
-  MONGODB_VERSION = "2.2.0"
+  # The minimum MongoDB version supported.
+  MONGODB_VERSION = "2.4.0"
 
   # Sets the Mongoid configuration options. Best used by passing a block.
   #
@@ -53,41 +54,47 @@ module Mongoid
     block_given? ? yield(Config) : Config
   end
 
-  # Convenience method for getting the default session.
+  # Convenience method for getting the default client.
   #
-  # @example Get the default session.
-  #   Mongoid.default_session
+  # @example Get the default client.
+  #   Mongoid.default_client
   #
-  # @return [ Moped::Session ] The default session.
+  # @return [ Mongo::Client ] The default client.
   #
   # @since 3.0.0
-  def default_session
-    Sessions.default
+  def default_client
+    Clients.default
   end
+  alias :default_session :default_client
+  deprecate :default_session, :default_client, 2015, 12
 
-  # Disconnect all active sessions.
+  # Disconnect all active clients.
   #
-  # @example Disconnect all active sessions.
-  #   Mongoid.disconnect_sessions
+  # @example Disconnect all active clients.
+  #   Mongoid.disconnect_clients
   #
   # @return [ true ] True.
   #
   # @since 3.1.0
-  def disconnect_sessions
-    Sessions.disconnect
+  def disconnect_clients
+    Clients.disconnect
   end
+  alias :disconnect_sessions :disconnect_clients
+  deprecate :disconnect_sessions, :disconnect_clients, 2015, 12
 
-  # Convenience method for getting a named session.
+  # Convenience method for getting a named client.
   #
-  # @example Get a named session.
-  #   Mongoid.session(:default)
+  # @example Get a named client.
+  #   Mongoid.client(:default)
   #
-  # @return [ Moped::Session ] The named session.
+  # @return [ Mongo::Client ] The named client.
   #
   # @since 3.0.0
-  def session(name)
-    Sessions.with_name(name)
+  def client(name)
+    Clients.with_name(name)
   end
+  alias :session :client
+  deprecate :session, :client, 2015, 12
 
   # Take all the public instance methods from the Config singleton and allow
   # them to be accessed through the Mongoid module directly.