mongoid 4.0.0.alpha2 → 4.0.0.beta1

data/lib/mongoid/relations/eager/belongs_to.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid
   module Relations
     module Eager

data/lib/mongoid/relations/eager/has_and_belongs_to_many.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid
   module Relations
     module Eager
@@ -9,18 +10,24 @@ module Mongoid
             set_relation(d, [])
           end
 
-          entries = Hash.new { |hash, key| hash[key] = [] }
+          entries = {}
           each_loaded_document do |doc|
+            entries[doc.send(key)] = doc
+          end
 
-            ids = doc.send(key)
-            ids.each do |id|
-              entries[id] << doc
-            end
+          @docs.each do |d|
+            keys = d.send(group_by_key)
+            docs = entries.values_at(*keys)
+            set_relation(d, docs)
           end
+        end
 
-          entries.each do |id, docs|
-            set_on_parent(id, docs)
+        def keys_from_docs
+          keys = Set.new
+          @docs.each do |d|
+            keys += d.send(group_by_key)
           end
+          keys.to_a
         end
 
         def set_relation(doc, element)
@@ -28,11 +35,11 @@ module Mongoid
         end
 
         def group_by_key
-          @metadata.primary_key
+          @metadata.foreign_key
         end
 
         def key
-          @metadata.inverse_foreign_key
+          @metadata.primary_key
         end
       end
     end

data/lib/mongoid/relations/eager/has_many.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid
   module Relations
     module Eager

data/lib/mongoid/relations/eager/has_one.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Mongoid
   module Relations
     module Eager

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

@@ -198,7 +198,7 @@ module Mongoid
         def normalize_docs(docs)
           if docs.first.is_a?(::Hash)
             docs.map do |doc|
-              attributes = { metadata: metadata, _parent: base }
+              attributes = { __metadata: __metadata, _parent: base }
               attributes.merge!(doc)
               Factory.build(klass, attributes)
             end

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

@@ -61,7 +61,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Embedded::In.new(base, target, metadata)
+          Bindings::Embedded::In.new(base, target, __metadata)
         end
 
         # Characterize the document.
@@ -73,8 +73,8 @@ module Mongoid
         #
         # @since 2.1.0
         def characterize_one(document)
-          unless base.metadata
-            base.metadata = metadata.inverse_metadata(document)
+          unless base.__metadata
+            base.__metadata = __metadata.inverse_metadata(document)
           end
         end
 
@@ -209,7 +209,7 @@ module Mongoid
           #
           # @since 2.1.0
           def valid_options
-            [ :autobuild, :cyclic, :polymorphic ]
+            [ :autobuild, :cyclic, :polymorphic, :touch ]
           end
 
           # Get the default validation setting for the relation. Determines if

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

@@ -79,7 +79,7 @@ module Mongoid
         #
         # @return [ Document ] The new document.
         def build(attributes = {}, type = nil)
-          doc = Factory.build(type || metadata.klass, attributes)
+          doc = Factory.build(type || __metadata.klass, attributes)
           append(doc)
           doc.apply_post_processed_defaults
           yield(doc) if block_given?
@@ -341,7 +341,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Embedded::Many.new(base, target, metadata)
+          Bindings::Embedded::Many.new(base, target, __metadata)
         end
 
         # Returns the criteria object for the target class with its documents set
@@ -355,7 +355,9 @@ module Mongoid
           criterion = klass.scoped
           criterion.embedded = true
           criterion.documents = target
-          Many.apply_ordering(criterion, metadata)
+          criterion.parent_document = base
+          criterion.metadata = relation_metadata
+          Many.apply_ordering(criterion, __metadata)
         end
 
         # Deletes one document from the target and unscoped.
@@ -443,8 +445,8 @@ module Mongoid
         #
         # @since 2.4.0
         def scope(docs)
-          return docs unless metadata.order || metadata.klass.default_scoping?
-          crit = metadata.klass.order_by(metadata.order)
+          return docs unless __metadata.order || __metadata.klass.default_scoping?
+          crit = __metadata.klass.order_by(__metadata.order)
           crit.embedded = true
           crit.documents = docs
           crit.entries

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

@@ -66,7 +66,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Embedded::One.new(base, target, metadata)
+          Bindings::Embedded::One.new(base, target, __metadata)
         end
 
         # Are we able to persist this relation?

data/lib/mongoid/relations/macros.rb

@@ -55,6 +55,7 @@ module Mongoid
           self.embedded = true
           relate(name, meta)
           builder(name, meta).creator(name, meta)
+          touchable(meta)
           add_counter_cache_callbacks(meta) if meta.counter_cached?
           meta
         end

data/lib/mongoid/relations/marshalable.rb

@@ -12,7 +12,7 @@ module Mongoid
       #
       # @since 3.0.15
       def marshal_dump
-        [ base, target, metadata ]
+        [ base, target, __metadata ]
       end
 
       # Takes the provided data and sets it back on the proxy.
@@ -24,8 +24,8 @@ module Mongoid
       #
       # @since 3.0.15
       def marshal_load(data)
-        @base, @target, @metadata = data
-        extend_proxy(metadata.extension) if metadata.extension?
+        @base, @target, @__metadata = data
+        extend_proxy(__metadata.extension) if __metadata.extension?
       end
     end
   end

data/lib/mongoid/relations/proxy.rb

@@ -18,10 +18,11 @@ module Mongoid
       include Threaded::Lifecycle
       include Marshalable
 
-      attr_accessor :base, :metadata, :target
+      attr_accessor :base, :__metadata, :target
+      alias :relation_metadata :__metadata
 
       # Backwards compatibility with Mongoid beta releases.
-      delegate :foreign_key, :inverse_foreign_key, to: :metadata
+      delegate :foreign_key, :inverse_foreign_key, to: :__metadata
       delegate :bind_one, :unbind_one, to: :binding
       delegate :collection_name, to: :base
 
@@ -37,7 +38,7 @@ module Mongoid
       #
       # @since 2.0.0.rc.1
       def init(base, target, metadata)
-        @base, @target, @metadata = base, target, metadata
+        @base, @target, @__metadata = base, target, metadata
         yield(self) if block_given?
         extend_proxies(metadata.extension) if metadata.extension?
       end
@@ -56,7 +57,7 @@ module Mongoid
       #
       # @since 3.0.15
       def klass
-        metadata ? metadata.klass : nil
+        __metadata ? __metadata.klass : nil
       end
 
       # Resets the criteria inside the relation proxy. Used by many to many
@@ -137,7 +138,7 @@ module Mongoid
       #
       # @since 2.0.0.rc.4
       def characterize_one(document)
-        document.metadata = metadata unless document.metadata
+        document.__metadata = __metadata unless document.__metadata
       end
 
       # Default behavior of method missing should be to delegate all calls
@@ -159,7 +160,7 @@ module Mongoid
       #
       # @since 2.0.0
       def raise_mixed
-        raise Errors::MixedRelations.new(base.class, metadata.klass)
+        raise Errors::MixedRelations.new(base.class, __metadata.klass)
       end
 
       # When the base is not yet saved and the user calls create or create!
@@ -189,11 +190,12 @@ module Mongoid
       # @since 3.1.0
       def callback_method(callback_name)
         methods = []
-        if metadata[callback_name]
-          if metadata[callback_name].is_a? Array
-            methods.concat(metadata[callback_name])
+        metadata = __metadata[callback_name]
+        if metadata
+          if metadata.is_a?(Array)
+            methods.concat(metadata)
           else
-            methods << metadata[callback_name]
+            methods << metadata
           end
         end
         methods

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

@@ -71,7 +71,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Referenced::In.new(base, target, metadata)
+          Bindings::Referenced::In.new(base, target, __metadata)
         end
 
         # Normalize the value provided as a replacement for substitution.
@@ -88,7 +88,7 @@ module Mongoid
         # @since 3.1.5
         def normalize(replacement)
           return replacement if replacement.is_a?(Document)
-          metadata.builder(klass, replacement).build
+          __metadata.builder(klass, replacement).build
         end
 
         # Are we able to persist this relation?

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

@@ -245,7 +245,7 @@ module Mongoid
         #
         # @since 2.0.0.beta.1
         def purge
-          unless metadata.destructive?
+          unless __metadata.destructive?
             nullify
           else
             after_remove_error = nil
@@ -304,7 +304,7 @@ module Mongoid
         # @since 2.4.0
         def unscoped
           klass.unscoped.where(
-            foreign_key => Conversions.flag(base.id, metadata)
+            foreign_key => Conversions.flag(base.id, __metadata)
           )
         end
 
@@ -340,7 +340,7 @@ module Mongoid
         #
         # @since 2.0.0.rc.1
         def binding
-          Bindings::Referenced::Many.new(base, target, metadata)
+          Bindings::Referenced::Many.new(base, target, __metadata)
         end
 
         # Get the collection of the relation in question.
@@ -366,8 +366,8 @@ module Mongoid
         # @since 2.0.0.beta.1
         def criteria
           Many.criteria(
-            metadata,
-            Conversions.flag(base.send(metadata.primary_key), metadata),
+            __metadata,
+            Conversions.flag(base.send(__metadata.primary_key), __metadata),
             base.class
           )
         end
@@ -385,8 +385,8 @@ module Mongoid
         # @since 2.1.0
         def cascade!(document)
           if persistable?
-            if metadata.destructive?
-              document.send(metadata.dependent)
+            if __metadata.destructive?
+              document.send(__metadata.dependent)
             else
               document.save
             end
@@ -486,7 +486,7 @@ module Mongoid
         # @since 2.4.0
         def remove_not_in(ids)
           removed = criteria.not_in(_id: ids)
-          if metadata.destructive?
+          if __metadata.destructive?
             removed.delete_all
           else
             removed.update_all(foreign_key => nil)
@@ -495,7 +495,7 @@ module Mongoid
             if !ids.include?(doc.id)
               unbind_one(doc)
               target.delete(doc)
-              if metadata.destructive?
+              if __metadata.destructive?
                 doc.destroyed = true
               end
             end

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
@@ -114,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
@@ -133,7 +133,7 @@ module Mongoid
           target.each do |doc|
             execute_callback :before_remove, doc
           end
-          unless metadata.forced_nil_inverse?
+          unless __metadata.forced_nil_inverse?
             criteria.pull(inverse_foreign_key => base.id)
           end
           if persistable?
@@ -142,7 +142,7 @@ module Mongoid
           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
@@ -221,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.
@@ -238,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
@@ -249,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.

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?

data/lib/mongoid/{state.rb → stateful.rb}

@@ -3,7 +3,7 @@ module Mongoid
 
   # This module contains the behaviour for getting the various states a
   # document can transition through.
-  module State
+  module Stateful
 
     attr_writer :destroyed, :flagged_for_destroy, :new_record
 
@@ -70,6 +70,18 @@ module Mongoid
         !_parent.delayed_atomic_sets[atomic_path]
     end
 
+    # Is the document readonly?
+    #
+    # @example Is the document readonly?
+    #   document.readonly?
+    #
+    # @return [ true, false ] If the document is readonly.
+    #
+    # @since 4.0.0
+    def readonly?
+      __selected_fields != nil
+    end
+
     # Determine if the document can be set.
     #
     # @example Is this settable?