Builders now take in the base document

lib/mongoid/relations/accessors.rb

@@ -40,7 +40,7 @@ def build(name, object, metadata)
       # @since 2.0.0.rc.1
       def create_relation(object, metadata)
         type = @attributes[metadata.inverse_type]
-        target = metadata.builder(object).build(type)
+        target = metadata.builder(self, object).build(type)
         target ? metadata.relation.new(self, target, metadata) : nil
       end
 

lib/mongoid/relations/builder.rb

@@ -8,20 +8,21 @@ module Relations #:nodoc:
     class Builder
       include Threaded::Lifecycle
 
-      attr_reader :metadata, :object
+      attr_reader :base, :metadata, :object
 
       # Instantiate the new builder for a relation.
       #
       # @example Create the builder.
       #   Builder.new(metadata, { :field => "value })
       #
+      # @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
       #   id to query with.
       #
       # @since 2.0.0.rc.1
-      def initialize(metadata, object)
-        @metadata, @object = metadata, object
+      def initialize(base, metadata, object)
+        @base, @metadata, @object = base, metadata, object
       end
 
       protected

lib/mongoid/relations/embedded/in.rb

@@ -100,14 +100,15 @@ class << self
           # @example Get the builder.
           #   Embedded::In.builder(meta, object, person)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build with.
           #
           # @return [ Builder ] A newly instantiated builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Embedded::In.new(meta, object)
+          def builder(base, meta, object)
+            Builders::Embedded::In.new(base, meta, object)
           end
 
           # Returns true if the relation is an embedded one. In this case

lib/mongoid/relations/embedded/many.rb

@@ -261,7 +261,7 @@ def substitute(replacement)
             else
               atomically(:$set) do
                 if replacement.first.is_a?(Hash)
-                  replacement = Many.builder(metadata, replacement).build
+                  replacement = Many.builder(base, metadata, replacement).build
                 end
                 proxy.target = replacement.compact
                 if _assigning?
@@ -437,15 +437,16 @@ class << self
           # @example Get the builder.
           #   Embedded::Many.builder(meta, object)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build
           #   with.
           #
           # @return [ Builder ] A newly instantiated builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Embedded::Many.new(meta, object)
+          def builder(base, meta, object)
+            Builders::Embedded::Many.new(base, meta, object)
           end
 
           # Returns true if the relation is an embedded one. In this case

lib/mongoid/relations/embedded/one.rb

@@ -84,14 +84,15 @@ class << self
           # @example Get the builder.
           #   Embedded::One.builder(meta, object, person)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build with.
           #
           # @return [ Builder ] A newly instantiated builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Embedded::One.new(meta, object)
+          def builder(base, meta, object)
+            Builders::Embedded::One.new(base, meta, object)
           end
 
           # Returns true if the relation is an embedded one. In this case

lib/mongoid/relations/metadata.rb

@@ -62,13 +62,14 @@ def autosave?
       # @example Get the builder.
       #   metadata.builder(document)
       #
+      # @param [ Document ] base The base document.
       # @param [ Object ] object A document or attributes to give the builder.
       #
       # @return [ Builder ] The builder for the relation.
       #
       # @since 2.0.0.rc.1
-      def builder(object)
-        relation.builder(self, object)
+      def builder(base, object)
+        relation.builder(base, self, object)
       end
 
       # Returns the name of the strategy used for handling dependent relations.

lib/mongoid/relations/referenced/in.rb

@@ -82,15 +82,16 @@ class << self
           # @example Get the builder.
           #   Referenced::In.builder(meta, object)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build
           #   with.
           #
           # @return [ Builder ] A new builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Referenced::In.new(meta, object)
+          def builder(base, meta, object)
+            Builders::Referenced::In.new(base, meta, object)
           end
 
           # Get the standard criteria used for querying this relation.

lib/mongoid/relations/referenced/many.rb

@@ -445,15 +445,16 @@ class << self
           # @example Get the builder.
           #   Referenced::Many.builder(meta, object)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build
           #   with.
           #
           # @return [ Builder ] A new builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Referenced::Many.new(meta, object || [])
+          def builder(base, meta, object)
+            Builders::Referenced::Many.new(base, meta, object || [])
           end
 
           # Get the standard criteria used for querying this relation.

lib/mongoid/relations/referenced/many_to_many.rb

@@ -216,15 +216,16 @@ class << self
           # @example Get the builder.
           #   Referenced::ManyToMany.builder(meta, object)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build
           #   with.
           #
           # @return [ Builder ] A new builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Referenced::ManyToMany.new(meta, object)
+          def builder(base, meta, object)
+            Builders::Referenced::ManyToMany.new(base, meta, object)
           end
 
           # Create the standard criteria for this relation given the supplied

lib/mongoid/relations/referenced/one.rb

@@ -93,15 +93,16 @@ class << self
           # @example Get the builder.
           #   Referenced::One.builder(meta, object)
           #
+          # @param [ Document ] base The base document.
           # @param [ Metadata ] meta The metadata of the relation.
           # @param [ Document, Hash ] object A document or attributes to build
           #   with.
           #
           # @return [ Builder ] A new builder object.
           #
           # @since 2.0.0.rc.1
-          def builder(meta, object)
-            Builders::Referenced::One.new(meta, object)
+          def builder(base, meta, object)
+            Builders::Referenced::One.new(base, meta, object)
           end
 
           # Get the standard criteria used for querying this relation.

spec/unit/mongoid/relations/builders/embedded/in_spec.rb

@@ -8,14 +8,18 @@
       stub
     end
 
+    let(:base) do
+      stub
+    end
+
     let(:metadata) do
       stub(:klass => Person, :name => :person)
     end
 
     context "when a document is provided" do
 
       let(:builder) do
-        described_class.new(metadata, object)
+        described_class.new(base, metadata, object)
       end
 
       let(:document) do

spec/unit/mongoid/relations/builders/embedded/many_spec.rb

@@ -2,8 +2,12 @@
 
 describe Mongoid::Relations::Builders::Embedded::Many do
 
+  let(:base) do
+    stub
+  end
+
   let(:builder) do
-    described_class.new(metadata, object)
+    described_class.new(base, metadata, object)
   end
 
   describe "#build" do
@@ -53,7 +57,7 @@
       end
 
       let(:builder) do
-        described_class.new(metadata, nil)
+        described_class.new(nil, metadata, nil)
       end
 
       before do

spec/unit/mongoid/relations/builders/embedded/one_spec.rb

@@ -2,8 +2,12 @@
 
 describe Mongoid::Relations::Builders::Embedded::One do
 
+  let(:base) do
+    stub
+  end
+
   let(:builder) do
-    described_class.new(metadata, object)
+    described_class.new(base, metadata, object)
   end
 
   describe "#build" do
@@ -15,7 +19,7 @@
       end
 
       let(:builder) do
-        described_class.new(metadata, nil)
+        described_class.new(nil, metadata, nil)
       end
 
       before do

spec/unit/mongoid/relations/builders/referenced/in_spec.rb

@@ -2,6 +2,10 @@
 
 describe Mongoid::Relations::Builders::Referenced::In do
 
+  let(:base) do
+    stub
+  end
+
   describe "#build" do
 
     let(:criteria) do
@@ -18,7 +22,7 @@
     end
 
     let(:builder) do
-      described_class.new(metadata, object)
+      described_class.new(base, metadata, object)
     end
 
     context "when provided an id" do

spec/unit/mongoid/relations/builders/referenced/many_spec.rb

@@ -2,6 +2,10 @@
 
 describe Mongoid::Relations::Builders::Referenced::Many do
 
+  let(:base) do
+    stub
+  end
+
   describe "#build" do
 
     let(:criteria) do
@@ -19,7 +23,7 @@
     end
 
     let(:builder) do
-      described_class.new(metadata, object)
+      described_class.new(base, metadata, object)
     end
 
     context "when provided an id" do

spec/unit/mongoid/relations/builders/referenced/many_to_many_spec.rb

@@ -2,6 +2,10 @@
 
 describe Mongoid::Relations::Builders::Referenced::ManyToMany do
 
+  let(:base) do
+    stub
+  end
+
   describe "#build" do
 
     let(:metadata) do
@@ -14,7 +18,7 @@
     end
 
     let(:builder) do
-      described_class.new(metadata, object)
+      described_class.new(base, metadata, object)
     end
 
     context "when provided ids" do

spec/unit/mongoid/relations/builders/referenced/one_spec.rb

@@ -2,6 +2,10 @@
 
 describe Mongoid::Relations::Builders::Referenced::One do
 
+  let(:base) do
+    stub
+  end
+
   describe "#build" do
 
     let(:criteria) do
@@ -19,7 +23,7 @@
     end
 
     let(:builder) do
-      described_class.new(metadata, object)
+      described_class.new(base, metadata, object)
     end
 
     context "when provided an id" do

spec/unit/mongoid/relations/embedded/in_spec.rb

@@ -52,7 +52,7 @@
   describe ".builder" do
 
     it "returns the embedded one builder" do
-      described_class.builder(metadata, target).should be_a(builder_klass)
+      described_class.builder(base, metadata, target).should be_a(builder_klass)
     end
   end
 

spec/unit/mongoid/relations/embedded/many_spec.rb

@@ -150,7 +150,7 @@
     end
 
     it "returns the many builder" do
-      described_class.builder(metadata, document).should
+      described_class.builder(base, metadata, document).should
         be_a(Mongoid::Relations::Builders::Embedded::Many)
     end
   end

spec/unit/mongoid/relations/embedded/one_spec.rb

@@ -52,7 +52,7 @@
   describe ".builder" do
 
     it "returns the embedded one builder" do
-      described_class.builder(metadata, target).should be_a(builder_klass)
+      described_class.builder(base, metadata, target).should be_a(builder_klass)
     end
   end
 

spec/unit/mongoid/relations/metadata_spec.rb

@@ -12,8 +12,12 @@
       stub
     end
 
+    let(:base) do
+      stub
+    end
+
     it "returns the builder from the relation" do
-      metadata.builder(object).should
+      metadata.builder(base, object).should
         be_a_kind_of(Mongoid::Relations::Builders::Embedded::One)
     end
   end

spec/unit/mongoid/relations/referenced/in_spec.rb

@@ -17,7 +17,7 @@
     end
 
     it "returns the embedded in builder" do
-      described_class.builder(metadata, document).should
+      described_class.builder(nil, metadata, document).should
         be_a_kind_of(builder_klass)
     end
   end

spec/unit/mongoid/relations/referenced/many_spec.rb

@@ -17,7 +17,7 @@
     end
 
     it "returns the embedded in builder" do
-      described_class.builder(metadata, document).should
+      described_class.builder(nil, metadata, document).should
         be_a_kind_of(builder_klass)
     end
   end