mongoid 2.4.10 → 3.0.0

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Embedded
 
         # Binding class for embedded_in relations.
         class In < Binding
@@ -23,20 +23,17 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind
+          def bind_one
             base.metadata = metadata.inverse_metadata(target) unless base.metadata
             base.parentize(target)
-            unless _binding?
-              _binding do
-                if base.embedded_many?
-                  target.do_or_do_not(metadata.inverse(target)).push(base)
-                else
-                  target.do_or_do_not(metadata.inverse_setter(target), base)
-                end
+            binding do
+              if base.embedded_many?
+                target.do_or_do_not(metadata.inverse(target)).push(base)
+              else
+                target.do_or_do_not(metadata.inverse_setter(target), base)
               end
             end
           end
-          alias :bind_one :bind
 
           # Unbinds the base object and the inverse, caused by setting the
           # reference to nil.
@@ -50,18 +47,15 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :continue Do we continue unbinding?
           #
           # @since 2.0.0.rc.1
-          def unbind
-            unless _binding?
-              _binding do
-                if base.embedded_many?
-                  target.do_or_do_not(metadata.inverse(target)).delete(base)
-                else
-                  target.do_or_do_not(metadata.inverse_setter(target), nil)
-                end
+          def unbind_one
+            binding do
+              if base.embedded_many?
+                target.do_or_do_not(metadata.inverse(target)).delete(base)
+              else
+                target.do_or_do_not(metadata.inverse_setter(target), nil)
               end
             end
           end
-          alias :unbind_one :unbind
         end
       end
     end

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

@@ -1,32 +1,12 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Embedded
 
         # Binding class for embeds_many relations.
         class Many < Binding
 
-          # Binds the base object to the inverse of the relation. This is so we
-          # are referenced to the actual objects themselves on both sides.
-          #
-          # This case sets the metadata on the inverse object as well as the
-          # document itself.
-          #
-          # @example Bind all the documents.
-          #   person.addresses.bind
-          #   person.addresses = [ Address.new ]
-          #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
-          # @since 2.0.0.rc.1
-          def bind
-            target.each { |doc| bind_one(doc) }
-          end
-
           # Binds a single document with the inverse relation. Used
           # specifically when appending to the proxy.
           #
@@ -42,32 +22,13 @@ module Mongoid # :nodoc:
           # @since 2.0.0.rc.1
           def bind_one(doc)
             doc.parentize(base)
-            unless _binding?
-              _binding do
-                unless metadata.versioned?
-                  doc.do_or_do_not(metadata.inverse_setter(target), base)
-                end
+            binding do
+              unless metadata.versioned?
+                doc.do_or_do_not(metadata.inverse_setter(target), base)
               end
             end
           end
 
-          # Unbinds the base object and the inverse, caused by setting the
-          # reference to nil.
-          #
-          # @example Unbind the documents.
-          #   person.addresses.unbind
-          #   person.addresses = nil
-          #
-          # @param [ Hash ] options The binding options.
-          #
-          # @option options [ true, false ] :continue Continue binding the inverse.
-          # @option options [ true, false ] :binding Are we in build mode?
-          #
-          # @since 2.0.0.rc.1
-          def unbind
-            target.each { |doc| unbind_one(doc) }
-          end
-
           # Unbind a single document.
           #
           # @example Unbind the document.
@@ -80,10 +41,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            unless _binding?
-              _binding do
-                doc.do_or_do_not(metadata.inverse_setter(target), nil)
-              end
+            binding do
+              doc.do_or_do_not(metadata.inverse_setter(target), nil)
             end
           end
         end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Embedded #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Embedded
 
         # Binding class for embeds_one relations.
         class One < Binding
@@ -23,15 +23,12 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def bind
+          def bind_one
             target.parentize(base)
-            unless _binding?
-              _binding do
-                target.do_or_do_not(metadata.inverse_setter(target), base)
-              end
+            binding do
+              target.do_or_do_not(metadata.inverse_setter(target), base)
             end
           end
-          alias :bind_one :bind
 
           # Unbinds the base object and the inverse, caused by setting the
           # reference to nil.
@@ -46,14 +43,11 @@ module Mongoid # :nodoc:
           # @option options [ true, false ] :binding Are we in build mode?
           #
           # @since 2.0.0.rc.1
-          def unbind
-            unless _binding?
-              _binding do
-                target.do_or_do_not(metadata.inverse_setter(target), nil)
-              end
+          def unbind_one
+            binding do
+              target.do_or_do_not(metadata.inverse_setter(target), nil)
             end
           end
-          alias :unbind_one :unbind
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Referenced
 
         # Binding class for all referenced_in relations.
         class In < Binding
@@ -18,27 +18,23 @@ module Mongoid # :nodoc:
           #   game.person = Person.new
           #
           # @since 2.0.0.rc.1
-          def bind
-            base.you_must(metadata.foreign_key_setter, target.id)
-            if metadata.inverse_type
-              base.you_must(metadata.inverse_type_setter, target.class.model_name)
-            end
-            unless _binding?
-              _binding do
-                inverse = metadata.inverse(target)
-                if inverse
-                  if set_base_metadata
-                    if base.referenced_many?
-                      target.send(inverse).push(base) unless Mongoid.identity_map_enabled?
-                    else
-                      target.do_or_do_not(metadata.inverse_setter(target), base)
-                    end
+          def bind_one
+            binding do
+              check_inverses!(target)
+              bind_foreign_key(base, target.id)
+              bind_polymorphic_inverse_type(base, target.class.model_name)
+              if inverse = metadata.inverse(target)
+                if set_base_metadata
+                  bind_inverse_of_field(base, base.metadata_name)
+                  if base.referenced_many?
+                    target.__send__(inverse).push(base) unless Mongoid.using_identity_map?
+                  else
+                    target.do_or_do_not(metadata.inverse_setter(target), base)
                   end
                 end
               end
             end
           end
-          alias :bind_one :bind
 
           # Unbinds the base object and the inverse, caused by setting the
           # reference to nil.
@@ -48,47 +44,25 @@ module Mongoid # :nodoc:
           #   game.person = nil
           #
           # @since 2.0.0.rc.1
-          def unbind
-            base.you_must(metadata.foreign_key_setter, nil)
-            if metadata.inverse_type
-              base.you_must(metadata.inverse_type_setter, nil)
-            end
-            unless _binding?
-              _binding do
-                inverse = metadata.inverse(target)
-                if inverse
-                  set_base_metadata
-                  if base.referenced_many?
-                    target.send(inverse).delete(base)
-                  else
-                    target.send(metadata.inverse_setter(target), nil)
-                  end
+          def unbind_one
+            binding do
+              inverse = metadata.inverse(target)
+              if !inverse && metadata.inverse_of_field
+                inverse = base.__send__(metadata.inverse_of_field)
+              end
+              bind_foreign_key(base, nil)
+              bind_polymorphic_inverse_type(base, nil)
+              bind_inverse_of_field(base, nil)
+              if inverse
+                set_base_metadata
+                if base.referenced_many?
+                  target.__send__(inverse).delete(base)
+                else
+                  target.__send__("#{inverse}=", nil)
                 end
               end
             end
           end
-          alias :unbind_one :unbind
-
-          private
-
-          # Ensure that the metadata on the base is correct, for the cases
-          # where we have multiple belongs to definitions and were are setting
-          # different parents in memory in order.
-          #
-          # @api private
-          #
-          # @example Set the base metadata.
-          #   binding.set_base_metadata
-          #
-          # @return [ true, false ] If the metadata changed.
-          #
-          # @since 2.4.4
-          def set_base_metadata
-            inverse_metadata = metadata.inverse_metadata(target)
-            if inverse_metadata != metadata && !inverse_metadata.nil?
-              base.metadata = inverse_metadata
-            end
-          end
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Referenced
 
         # Binding class for references_many relations.
         class Many < Binding
@@ -17,14 +17,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
-            doc.you_must(metadata.foreign_key_setter, base.id)
-            if metadata.type
-              doc.you_must(metadata.type_setter, base.class.model_name)
-            end
-            unless _binding?
-              _binding do
-                doc.send(metadata.inverse_setter, base)
-              end
+            binding do
+              bind_from_relational_parent(doc)
             end
           end
 
@@ -37,14 +31,8 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            doc.you_must(metadata.foreign_key_setter, nil)
-            if metadata.type
-              doc.you_must(metadata.type_setter, nil)
-            end
-            unless _binding?
-              _binding do
-                doc.send(metadata.inverse_setter, nil)
-              end
+            binding do
+              unbind_from_relational_parent(doc)
             end
           end
         end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Referenced
 
         # Binding class for all references_and_referenced_in_many relations.
         class ManyToMany < Binding
@@ -17,13 +17,11 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def bind_one(doc)
-            unless _binding?
-              _binding do
-                inverse_keys = doc.you_must(metadata.inverse_foreign_key)
-                inverse_keys.push(base.id) if inverse_keys
-                base.synced[metadata.foreign_key] = true
-                doc.synced[metadata.inverse_foreign_key] = true
-              end
+            binding do
+              inverse_keys = doc.you_must(metadata.inverse_foreign_key)
+              inverse_keys.push(base.id) if inverse_keys
+              base.synced[metadata.foreign_key] = true
+              doc.synced[metadata.inverse_foreign_key] = true
             end
           end
 
@@ -34,14 +32,12 @@ module Mongoid # :nodoc:
           #
           # @since 2.0.0.rc.1
           def unbind_one(doc)
-            unless _binding?
-              _binding do
-                base.send(metadata.foreign_key).delete_one(doc.id)
-                inverse_keys = doc.you_must(metadata.inverse_foreign_key)
-                inverse_keys.delete_one(base.id) if inverse_keys
-                base.synced[metadata.foreign_key] = true
-                doc.synced[metadata.inverse_foreign_key] = true
-              end
+            binding do
+              base.send(metadata.foreign_key).delete_one(doc.id)
+              inverse_keys = doc.you_must(metadata.inverse_foreign_key)
+              inverse_keys.delete_one(base.id) if inverse_keys
+              base.synced[metadata.foreign_key] = true
+              doc.synced[metadata.inverse_foreign_key] = true
             end
           end
         end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Bindings #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Bindings
+      module Referenced
 
         # Binding class for references_one relations.
         class One < Binding
@@ -18,18 +18,11 @@ module Mongoid # :nodoc:
           #   person.game = Game.new
           #
           # @since 2.0.0.rc.1
-          def bind
-            target.you_must(metadata.foreign_key_setter, base.id)
-            if metadata.type
-              target.you_must(metadata.type_setter, base.class.model_name)
-            end
-            unless _binding?
-              _binding do
-                target.send(metadata.inverse_setter, base)
-              end
+          def bind_one
+            binding do
+              bind_from_relational_parent(target)
             end
           end
-          alias :bind_one :bind
 
           # Unbinds the base object and the inverse, caused by setting the
           # reference to nil.
@@ -39,18 +32,11 @@ module Mongoid # :nodoc:
           #   person.game = nil
           #
           # @since 2.0.0.rc.1
-          def unbind
-            target.you_must(metadata.foreign_key_setter, nil)
-            if metadata.type
-              target.you_must(metadata.type_setter, nil)
-            end
-            unless _binding?
-              _binding do
-                target.send(metadata.inverse_setter, nil)
-              end
+          def unbind_one
+            binding do
+              unbind_from_relational_parent(target)
             end
           end
-          alias :unbind_one :unbind
         end
       end
     end

data/lib/mongoid/relations/builder.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
+module Mongoid
+  module Relations
 
     # Superclass for all builder objects. Builders are responsible for either
     # looking up a relation's target from the database, or creating them from a
@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
       #
       # @param [ Document ] base The base document.
       # @param [ Metdata ] metadata The metadata for the relation.
-      # @param [ Hash, BSON::ObjectId ] object The attributes to build from or
+      # @param [ Hash, Moped::BSON::ObjectId ] object The attributes to build from or
       #   id to query with.
       #
       # @since 2.0.0.rc.1
@@ -49,7 +49,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def query?
-        obj = Array(object).first
+        obj = object.__array__.first
         !obj.is_a?(Mongoid::Document) && !obj.nil?
       end
     end

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Embedded #:nodoc:
-        class In < Builder #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Embedded
+        class In < Builder
 
           # This builder doesn't actually build anything, just returns the
           # parent since it should already be instantiated.

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Embedded #:nodoc:
-        class Many < Builder #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Embedded
+        class Many < Builder
 
           # Builds the document out of the attributes using the provided
           # metadata on the relation. Instantiates through the factory in order
@@ -19,15 +19,15 @@ module Mongoid # :nodoc:
           def build(type = nil)
             return [] if object.blank?
             return object if object.first.is_a?(Document)
-            [].tap do |docs|
-              object.each do |attrs|
-                if _loading?
-                  docs.push(Factory.from_db(klass, attrs))
-                else
-                  docs.push(Factory.build(klass, attrs))
-                end
+            docs = []
+            object.each do |attrs|
+              if _loading? && base.persisted?
+                docs.push(Factory.from_db(klass, attrs))
+              else
+                docs.push(Factory.build(klass, attrs))
               end
             end
+            docs
           end
         end
       end

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

@@ -1,9 +1,9 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Embedded #:nodoc:
-        class One < Builder #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Embedded
+        class One < Builder
 
           # Builds the document out of the attributes using the provided
           # metadata on the relation. Instantiates through the factory in order
@@ -17,7 +17,7 @@ module Mongoid # :nodoc:
           # @return [ Document ] A single document.
           def build(type = nil)
             return object unless object.is_a?(Hash)
-            if _loading?
+            if _loading? && base.persisted?
               Factory.from_db(klass, object)
             else
               Factory.build(klass, object)

data/lib/mongoid/relations/builders/nested_attributes/many.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module NestedAttributes #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module NestedAttributes
         class Many < NestedBuilder
 
           # Builds the relation depending on the attributes and the options
@@ -25,9 +25,9 @@ module Mongoid # :nodoc:
             end
             attributes.each do |attrs|
               if attrs.respond_to?(:with_indifferent_access)
-                process(parent, attrs)
+                process_attributes(parent, attrs)
               else
-                process(parent, attrs[1])
+                process_attributes(parent, attrs[1])
               end
             end
           end
@@ -86,10 +86,10 @@ module Mongoid # :nodoc:
           # new, existing, or ignored document.
           #
           # @example Process the attributes
-          #   builder.process({ "id" => 1, "street" => "Bond" })
+          #   builder.process_attributes({ "id" => 1, "street" => "Bond" })
           #
           # @param [ Hash ] attrs The single document attributes to process.
-          def process(parent, attrs)
+          def process_attributes(parent, attrs)
             return if reject?(parent, attrs)
             if id = attrs.extract_id
               first = existing.first

data/lib/mongoid/relations/builders/nested_attributes/one.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module NestedAttributes #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module NestedAttributes
         class One < NestedBuilder
 
           attr_accessor :destroy
@@ -27,7 +27,7 @@ module Mongoid # :nodoc:
             if update?
               existing.attributes = attributes
             elsif replace?
-              parent.send(metadata.setter, Mongoid::Factory.build(metadata.klass, attributes))
+              parent.send(metadata.setter, Factory.build(metadata.klass, attributes))
             elsif delete?
               parent.send(metadata.setter, nil)
             end

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
-module Mongoid # :nodoc:
-  module Relations #:nodoc:
-    module Builders #:nodoc:
-      module Referenced #:nodoc:
+module Mongoid
+  module Relations
+    module Builders
+      module Referenced
         class In < Builder
 
           # This builder either takes a foreign key and queries for the