mongoid 3.1.6 → 4.0.0

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

@@ -29,7 +29,7 @@ module Mongoid
           return concat(docs) if docs.size > 1
           if doc = docs.first
             append(doc)
-            base.add_to_set(foreign_key, doc.send(metadata.primary_key))
+            base.add_to_set(foreign_key => doc.send(__metadata.primary_key))
             if child_persistable?(doc)
               doc.save
             end
@@ -65,7 +65,7 @@ module Mongoid
             end
           end
           if persistable? || _creating?
-            base.push_all(foreign_key, ids.keys)
+            base.push(foreign_key => ids.keys)
           end
           persist_delayed(docs, inserts)
           self
@@ -77,25 +77,19 @@ module Mongoid
         # @example Build a new document on the relation.
         #   person.posts.build(:title => "A new post")
         #
-        # @overload build(attributes = {}, options = {}, type = nil)
+        # @overload build(attributes = {}, type = nil)
         #   @param [ Hash ] attributes The attributes of the new document.
-        #   @param [ Hash ] options The scoped assignment options.
         #   @param [ Class ] type The optional subclass to build.
         #
         # @overload build(attributes = {}, type = nil)
         #   @param [ Hash ] attributes The attributes of the new document.
-        #   @param [ Hash ] options The scoped assignment options.
         #   @param [ Class ] type The optional subclass to build.
         #
         # @return [ Document ] The new document.
         #
         # @since 2.0.0.beta.1
-        def build(attributes = {}, options = {}, type = nil)
-          if options.is_a? Class
-            options, type = {}, options
-          end
-
-          doc = Factory.build(type || klass, attributes, options)
+        def build(attributes = {}, type = nil)
+          doc = Factory.build(type || klass, attributes)
           base.send(foreign_key).push(doc.id)
           append(doc)
           doc.apply_post_processed_defaults
@@ -120,7 +114,7 @@ module Mongoid
         def delete(document)
           doc = super
           if doc && persistable?
-            base.pull(foreign_key, doc.send(metadata.primary_key))
+            base.pull(foreign_key => doc.send(__metadata.primary_key))
             target._unloaded = criteria
             unsynced(base, foreign_key)
           end
@@ -139,19 +133,16 @@ module Mongoid
           target.each do |doc|
             execute_callback :before_remove, doc
           end
-          unless metadata.forced_nil_inverse?
-            criteria.pull(inverse_foreign_key, base.id)
+          unless __metadata.forced_nil_inverse?
+            criteria.pull(inverse_foreign_key => base.id)
           end
           if persistable?
-            base.set(
-              foreign_key,
-              base.send(foreign_key).clear
-            )
+            base.set(foreign_key => base.send(foreign_key).clear)
           end
           after_remove_error = nil
           many_to_many = target.clear do |doc|
             unbind_one(doc)
-            unless metadata.forced_nil_inverse?
+            unless __metadata.forced_nil_inverse?
               doc.changed_attributes.delete(inverse_foreign_key)
             end
             begin
@@ -230,7 +221,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Referenced::ManyToMany.new(base, target, metadata)
+          Bindings::Referenced::ManyToMany.new(base, target, __metadata)
         end
 
         # Determine if the child document should be persisted.
@@ -247,7 +238,7 @@ module Mongoid
         # @since 3.0.20
         def child_persistable?(doc)
           (persistable? || _creating?) &&
-            !(doc.persisted? && metadata.forced_nil_inverse?)
+            !(doc.persisted? && __metadata.forced_nil_inverse?)
         end
 
         # Returns the criteria object for the target class with its documents set
@@ -258,7 +249,7 @@ module Mongoid
         #
         # @return [ Criteria ] A new criteria.
         def criteria
-          ManyToMany.criteria(metadata, base.send(foreign_key))
+          ManyToMany.criteria(__metadata, base.send(foreign_key))
         end
 
         # Flag the base as unsynced with respect to the foreign key.
@@ -320,22 +311,8 @@ module Mongoid
             )
           end
 
-          # Get the criteria that is used to eager load a relation of this
-          # type.
-          #
-          # @example Get the eager load criteria.
-          #   Proxy.eager_load(metadata, criteria)
-          #
-          # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Array<Object> ] ids The ids of the documents to load.
-          #
-          # @return [ Criteria ] The criteria to eager load the relation.
-          #
-          # @since 2.2.0
-          def eager_load(metadata, ids)
-            metadata.klass.any_in(_id: ids).each do |doc|
-              IdentityMap.set(doc)
-            end
+          def eager_load_klass
+            Relations::Eager::HasAndBelongsToMany
           end
 
           # Returns true if the relation is an embedded one. In this case

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

@@ -53,13 +53,13 @@ module Mongoid
         def substitute(replacement)
           unbind_one
           if persistable?
-            if metadata.destructive?
-              send(metadata.dependent)
+            if __metadata.destructive?
+              send(__metadata.dependent)
             else
               save if persisted?
             end
           end
-          One.new(base, replacement, metadata) if replacement
+          One.new(base, replacement, __metadata) if replacement
         end
 
         private
@@ -73,7 +73,7 @@ module Mongoid
         #
         # @return [ Binding ] The binding object.
         def binding
-          Bindings::Referenced::One.new(base, target, metadata)
+          Bindings::Referenced::One.new(base, target, __metadata)
         end
 
         # Are we able to persist this relation?
@@ -122,33 +122,14 @@ module Mongoid
           # @since 2.1.0
           def criteria(metadata, object, type = nil)
             crit = metadata.klass.where(metadata.foreign_key => object)
-
             if metadata.polymorphic?
               crit = crit.where(metadata.type => type.name)
             end
-
-            inverse_metadata = metadata.inverse_metadata(metadata.klass)
-            if inverse_metadata.inverse_of_field
-              crit = crit.any_in(inverse_metadata.inverse_of_field => [metadata.name, nil])
-            end
-
             crit
           end
 
-          # Get the criteria that is used to eager load a relation of this
-          # type.
-          #
-          # @example Get the eager load criteria.
-          #   Proxy.eager_load(metadata, criteria)
-          #
-          # @param [ Metadata ] metadata The relation metadata.
-          # @param [ Array<Object> ] ids The ids of the base docs.
-          #
-          # @return [ Criteria ] The criteria to eager load the relation.
-          #
-          # @since 2.2.0
-          def eager_load(metadata, ids)
-            eager_load_ids(metadata, ids) { |doc, key| IdentityMap.set_one(doc, key) }
+          def eager_load_klass
+            Relations::Eager::HasOne
           end
 
           # Returns true if the relation is an embedded one. In this case

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
 
@@ -92,10 +92,10 @@ module Mongoid
           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/touchable.rb

@@ -4,6 +4,39 @@ module Mongoid
     module Touchable
       extend ActiveSupport::Concern
 
+      # Touch the document, in effect updating its updated_at timestamp and
+      # optionally the provided field to the current time. If any belongs_to
+      # relations exist with a touch option, they will be updated as well.
+      #
+      # @example Update the updated_at timestamp.
+      #   document.touch
+      #
+      # @example Update the updated_at and provided timestamps.
+      #   document.touch(:audited)
+      #
+      # @note This will not autobuild relations if those options are set.
+      #
+      # @param [ Symbol ] field The name of an additional field to update.
+      #
+      # @return [ true/false ] false if record is new_record otherwise true.
+      #
+      # @since 3.0.0
+      def touch(field = nil)
+        return false if _root.new_record?
+        current = Time.now
+        field = database_field_name(field)
+        write_attribute(:updated_at, current) if respond_to?("updated_at=")
+        write_attribute(field, current) if field
+
+        touches = touch_atomic_updates(field)
+        unless touches.empty?
+          selector = atomic_selector
+          _root.collection.where(selector).update(positionally(selector, touches))
+        end
+        run_callbacks(:touch)
+        true
+      end
+
       module ClassMethods
 
         # Add the metadata to the touchable relations if the touch option was
@@ -21,7 +54,7 @@ module Mongoid
           if metadata.touchable?
             name = metadata.name
             method_name = define_relation_touch_method(name)
-            after_create method_name
+            after_save method_name
             after_destroy method_name
             after_touch method_name
           end

data/lib/mongoid/relations.rb

@@ -46,7 +46,8 @@ module Mongoid
     include Touchable
     include CounterCache
 
-    attr_accessor :metadata
+    attr_accessor :__metadata
+    alias :relation_metadata :__metadata
 
     # Determine if the document itself is embedded in another document via the
     # proper channels. (If it has a parent document.)
@@ -70,7 +71,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def embedded_many?
-      metadata && metadata.macro == :embeds_many
+      __metadata && __metadata.macro == :embeds_many
     end
 
     # Determine if the document is part of an embeds_one relation.
@@ -82,7 +83,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def embedded_one?
-      metadata && metadata.macro == :embeds_one
+      __metadata && __metadata.macro == :embeds_one
     end
 
     # Get the metadata name for this document. If no metadata was defined
@@ -97,8 +98,8 @@ module Mongoid
     #
     # @since 3.0.0
     def metadata_name
-      raise Errors::NoMetadata.new(self.class.name) unless metadata
-      metadata.name
+      raise Errors::NoMetadata.new(self.class.name) unless __metadata
+      __metadata.name
     end
 
     # Determine if the document is part of an references_many relation.
@@ -110,7 +111,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def referenced_many?
-      metadata && metadata.macro == :has_many
+      __metadata && __metadata.macro == :has_many
     end
 
     # Determine if the document is part of an references_one relation.
@@ -122,7 +123,7 @@ module Mongoid
     #
     # @since 2.0.0.rc.1
     def referenced_one?
-      metadata && metadata.macro == :has_one
+      __metadata && __metadata.macro == :has_one
     end
 
     # Convenience method for iterating through the loaded relations and
@@ -136,27 +137,12 @@ module Mongoid
     # @since 2.1.6
     def reload_relations
       relations.each_pair do |name, meta|
-        if instance_variable_defined?("@#{name}")
-          if _parent.nil? || instance_variable_get("@#{name}") != _parent
-            remove_instance_variable("@#{name}")
+        if instance_variable_defined?("@_#{name}")
+          if _parent.nil? || instance_variable_get("@_#{name}") != _parent
+            remove_instance_variable("@_#{name}")
           end
         end
       end
     end
-
-    module ClassMethods
-
-      # This is convenience for librarys still on the old API.
-      #
-      # @example Get the associations.
-      #   Person.associations
-      #
-      # @return [ Hash ] The relations.
-      #
-      # @since 2.3.1
-      def associations
-        self.relations
-      end
-    end
   end
 end

data/lib/mongoid/{reloading.rb → reloadable.rb}

@@ -1,7 +1,10 @@
 # encoding: utf-8
 module Mongoid
+
   # This module handles reloading behaviour of documents.
-  module Reloading
+  #
+  # @since 4.0.0
+  module Reloadable
 
     # Reloads the +Document+ attributes from the database. If the document has
     # not been saved then an error will get raised if the configuration option
@@ -25,7 +28,6 @@ module Mongoid
       changed_attributes.clear
       apply_defaults
       reload_relations
-      IdentityMap.set(self)
       run_callbacks(:find) unless _find_callbacks.empty?
       run_callbacks(:initialize) unless _initialize_callbacks.empty?
       self
@@ -55,7 +57,7 @@ module Mongoid
     #
     # @since 2.3.2
     def reload_root_document
-      {}.merge(with(consistency: :strong).collection.find(_id: id).one || {})
+      {}.merge(with(read: :primary).collection.find(_id: id).one || {})
     end
 
     # Reload the embedded document.
@@ -68,7 +70,7 @@ module Mongoid
     # @since 2.3.2
     def reload_embedded_document
       extract_embedded_attributes({}.merge(
-        _root.with(consistency: :strong).collection.find(_id: _root.id).one
+        _root.with(read: :primary).collection.find(_id: _root.id).one
       ))
     end
 

data/lib/mongoid/{scoping.rb → scopable.rb}

@@ -1,9 +1,12 @@
 # encoding: utf-8
+
 module Mongoid
 
   # This module contains behaviour for all Mongoid scoping - named scopes,
   # default scopes, and criteria accessors via scoped and unscoped.
-  module Scoping
+  #
+  # @since 4.0.0
+  module Scopable
     extend ActiveSupport::Concern
 
     included do
@@ -12,6 +15,27 @@ module Mongoid
       self._declared_scopes = {}
     end
 
+    private
+
+    # Apply the default scoping to the attributes of the document, as long as
+    # they are not complex queries.
+    #
+    # @api private
+    #
+    # @example Apply the default scoping.
+    #   document.apply_default_scoping
+    #
+    # @return [ true, false ] If default scoping was applied.
+    #
+    # @since 4.0.0
+    def apply_default_scoping
+      if default_scoping
+        default_scoping.call.selector.each do |field, value|
+          attributes[field] = value unless value.respond_to?(:each_pair)
+        end
+      end
+    end
+
     module ClassMethods
 
       # Returns a hash of all the scopes defined for this class, including
@@ -22,7 +46,7 @@ module Mongoid
       #     include Mongoid::Document
       #     field :active, type: Boolean
       #
-      #     scope :active, where(active: true)
+      #     scope :active, -> { where(active: true) }
       #   end
       #   Band.scopes
       #
@@ -104,14 +128,14 @@ module Mongoid
       #     field :active, type: Boolean
       #     field :count, type: Integer
       #
-      #     scope :active, where(active: true)
+      #     scope :active, -> { where(active: true) }
       #     scope :at_least, ->(count){ where(:count.gt => count) }
       #   end
       #
       # @param [ Symbol ] name The name of the scope.
-      # @param [ Proc, Criteria ] conditions The conditions of the scope.
+      # @param [ Proc ] conditions The conditions of the scope.
       #
-      # @raise [ Errors::InvalidScope ] If the scope is not a proc or criteria.
+      # @raise [ Errors::InvalidScope ] If the scope is not a proc.
       # @raise [ Errors::ScopeOverwrite ] If the scope name already exists.
       #
       # @since 1.0.0
@@ -120,7 +144,7 @@ module Mongoid
         check_scope_validity(value)
         check_scope_name(normalized)
         _declared_scopes[normalized] = {
-          scope: strip_default_scope(value),
+          scope: value,
           extension: Module.new(&block)
         }
         define_scope_method(normalized)
@@ -279,7 +303,7 @@ module Mongoid
       #
       # @since 3.0.0
       def check_scope_validity(value)
-        unless value.respond_to?(:to_proc)
+        unless value.respond_to?(:call)
           raise Errors::InvalidScope.new(self, value)
         end
       end
@@ -298,15 +322,15 @@ module Mongoid
       #
       # @since 3.0.0
       def define_scope_method(name)
-        (class << self; self; end).class_eval <<-SCOPE, __FILE__, __LINE__ + 1
-          def #{name}(*args)
-            scoping = _declared_scopes[:#{name}]
+        singleton_class.class_eval do
+          define_method name do |*args|
+            scoping = _declared_scopes[name]
             scope, extension = scoping[:scope][*args], scoping[:extension]
-            criteria = with_default_scope.merge(scope || all)
+            criteria = with_default_scope.merge(scope || queryable)
             criteria.extend(extension)
             criteria
           end
-        SCOPE
+        end
       end
 
       # Process the default scope value. If one already exists, we merge the
@@ -327,30 +351,6 @@ module Mongoid
           value.to_proc
         end
       end
-
-      # Strip the default scope from the provided value, if it is a criteria.
-      # This is used by named scopes - they should not have the default scoping
-      # applied to them.
-      #
-      # @api private
-      #
-      # @example Strip the default scope.
-      #   Model.strip_default_scope
-      #
-      # @param [ Proc, Criteria ] value The value to strip from.
-      #
-      # @return [ Proc ] The stripped criteria, as a proc.
-      #
-      # @since 3.0.0
-      def strip_default_scope(value)
-        if value.is_a?(Criteria)
-          default = default_scoping.try(:call)
-          value.remove_scoping(default)
-          value.to_proc
-        else
-          value
-        end
-      end
     end
   end
 end

data/lib/mongoid/selectable.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+module Mongoid
+
+  # Provides behaviour for generating the selector for a specific document.
+  #
+  # @since 4.0.0
+  module Selectable
+    extend ActiveSupport::Concern
+
+    # Get the atomic selector for the document. This is a hash in the simplest
+    # case { "_id" => id }, but can become more complex for embedded documents
+    # and documents that use a shard key.
+    #
+    # @example Get the document's atomic selector.
+    #   document.atomic_selector
+    #
+    # @return [ Hash ] The document's selector.
+    #
+    # @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)
+    end
+  end
+end

data/lib/mongoid/{serialization.rb → serializable.rb}

@@ -3,9 +3,18 @@ module Mongoid
 
   # This module provides the extra behaviour for including relations in JSON
   # and XML serialization.
-  module Serialization
+  #
+  # @since 4.0.0
+  module Serializable
     extend ActiveSupport::Concern
 
+    # We need to redefine where the JSON configuration is getting defined,
+    # similar to +ActiveRecord+.
+    included do
+      undef_method :include_root_in_json
+      delegate :include_root_in_json, to: ::Mongoid
+    end
+
     # Gets the document as a serializable hash, used by ActiveModel's JSON
     # serializer.
     #
@@ -93,7 +102,7 @@ module Mongoid
         attrs[name] = value ? value.serializable_hash(options) : nil
       elsif names.include?(name) && !fields.has_key?(name)
         attrs[name] = read_attribute(name)
-      else
+      elsif !attribute_missing?(name)
         attrs[name] = send(name)
       end
     end

data/lib/mongoid/sessions/factory.rb

@@ -61,6 +61,8 @@ module Mongoid
         raise Errors::NoSessionsConfig.new unless configuration
         config, options = parse(configuration)
         configuration.merge!(config) if configuration.delete(:uri)
+
+        options[:instrumenter] = ActiveSupport::Notifications
         session = Moped::Session.new(config[:hosts], options)
         session.use(config[:database])
         if authenticated?(config)