mongoid 7.2.0.rc1 → 7.3.0

data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb

@@ -507,4 +507,54 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
       end
     end
   end
+
+  context "when the same class is embedded multiple times" do
+
+    let(:customer) do
+      Customer.new
+    end
+
+    context "assignment after saving" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+
+        customer.save!
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+
+    context "inverse assignment" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.work_address = CustomerAddress.new
+        customer.work_address.addressable = customer
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+  end
 end

data/spec/mongoid/association/nested/one_spec.rb

@@ -137,20 +137,24 @@ describe Mongoid::Association::Nested::One do
         { allow_destroy: true }
       end
 
-      let(:builder) do
-        described_class.new(association, {
-          id: name.id,
-          last_name: "Lang",
-          _destroy: true
-        }, options)
-      end
-
-      before do
-        builder.build(person)
-      end
-
-      it "deletes the relation" do
-        expect(person.name).to be_nil
+      %i(id _id).each do |id_field|
+        context "#{id_field}" do
+          let(:builder) do
+            described_class.new(association, {
+              id_field => name.id,
+              last_name: "Lang",
+              _destroy: true
+            }, options)
+          end
+
+          before do
+            builder.build(person)
+          end
+
+          it "deletes the relation" do
+            expect(person.name).to be_nil
+          end
+        end
       end
     end
   end

data/spec/mongoid/association/referenced/belongs_to/proxy_spec.rb

@@ -127,6 +127,23 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           it "does not save the target" do
             expect(person).to_not be_persisted
           end
+
+          it "drops private visibility from private methods" do
+            # This is unfortunate but it appears that Ruby does not
+            # have a way to distinguish how method_missing was invoked
+            # (i.e. via an explicit send or method call).
+            # See https://jira.mongodb.org/browse/MONGOID-5009
+            game.person.secret_name.should == 'secret'
+          end
+
+          it "allows private methods to be invoked" do
+            game.person.send(:secret_name).should == 'secret'
+          end
+
+          it "properly exposes delegated methods visibility" do
+            expect(defined?(game.person.id)).to eq("method")
+            expect(defined?(game.person.secret_name)).to be_nil
+          end
         end
 
         context "when the child is not a new record" do
@@ -508,7 +525,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              account.delete
+              account.destroy
             end
 
             it "deletes child" do
@@ -548,7 +565,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              drug.delete
+              drug.destroy
             end
 
             it "deletes child" do
@@ -600,10 +617,10 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
         context "when parent is persisted" do
 
-          context "when child is deleted" do
+          context "when child is destroyed" do
 
             before do
-              account.delete
+              account.destroy
             end
 
             it "deletes child" do
@@ -643,7 +660,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              drug.delete
+              drug.destroy
             end
 
             it "deletes child" do
@@ -690,10 +707,10 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
         context "when parent is persisted" do
 
-          context "when child is deleted" do
+          context "when child is destroyed" do
 
             before do
-              account.delete
+              account.destroy
             end
 
             it "deletes child" do
@@ -732,7 +749,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
           context "when child is destroyed" do
 
             before do
-              drug.delete
+              drug.destroy
             end
 
             it "deletes child" do

data/spec/mongoid/association/referenced/has_and_belongs_to_many/binding_spec.rb

@@ -14,7 +14,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Binding do
   end
 
   let(:target) do
-    Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ preference ])
+    Mongoid::Association::Referenced::HasMany::Enumerable.new([ preference ])
   end
 
   let(:association) do

data/spec/mongoid/association/referenced/has_many/binding_spec.rb

@@ -14,7 +14,7 @@ describe Mongoid::Association::Referenced::HasMany::Binding do
   end
 
   let(:target) do
-    Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ post ])
+    Mongoid::Association::Referenced::HasMany::Enumerable.new([ post ])
   end
 
   let(:association) do

data/spec/mongoid/association/referenced/has_many/enumerable_spec.rb

@@ -3,7 +3,7 @@
 
 require "spec_helper"
 
-describe Mongoid::Association::Referenced::HasMany::Targets::Enumerable do
+describe Mongoid::Association::Referenced::HasMany::Enumerable do
 
   describe "#==" do
 

data/spec/mongoid/association/referenced/has_many_models.rb

@@ -47,3 +47,15 @@ class HmmTicket
 
   belongs_to :person
 end
+
+class HmmBus
+  include Mongoid::Document
+
+  has_many :seats, class_name: 'HmmBusSeat'
+end
+
+class HmmBusSeat
+  include Mongoid::Document
+
+  # No belongs_to :bus
+end

data/spec/mongoid/association/referenced/has_one_models.rb

@@ -19,6 +19,14 @@ class HomAccreditation
 
   field :degree, type: String
   field :year, type: Integer, default: 2012
+
+  def format
+    'fmt'
+  end
+
+  def price
+    42
+  end
 end
 
 class HomAccreditation::Child
@@ -58,3 +66,15 @@ class HomPolymorphicChild
 
   belongs_to :p_parent, polymorphic: true
 end
+
+class HomBus
+  include Mongoid::Document
+
+  has_one :driver, class_name: 'HomBusDriver'
+end
+
+class HomBusDriver
+  include Mongoid::Document
+
+  # No belongs_to :bus
+end

data/spec/mongoid/association/referenced/has_one_spec.rb

@@ -748,7 +748,7 @@ describe Mongoid::Association::Referenced::HasOne do
     end
   end
 
-  describe '##inverse' do
+  describe '#inverse' do
 
     context 'when polymorphic' do
 

data/spec/mongoid/atomic/paths_spec.rb

@@ -113,10 +113,33 @@ describe Mongoid::Atomic::Paths do
         person.addresses << address
       end
 
-      it "returns the association with id.atomic_selector" do
-        expect(address.atomic_selector).to eq(
-          { "_id" => person.id, "addresses._id" => address.id }
-        )
+      context 'when the parent is persisted' do
+
+        let(:person) do
+          Person.create!
+        end
+
+        before do
+          person.should be_persisted
+        end
+
+        it "returns the association with id.atomic_selector" do
+          expect(address.atomic_selector).to eq(
+            { "_id" => person.id, "addresses._id" => address.id }
+          )
+        end
+      end
+
+      context 'when the parent is not persisted' do
+        before do
+          person.should be_new_record
+        end
+
+        it "returns the association with id.atomic_selector" do
+          expect(address.atomic_selector).to eq(
+            { "_id" => person.id, "addresses._id" => address.id }
+          )
+        end
       end
     end
 
@@ -127,14 +150,43 @@ describe Mongoid::Atomic::Paths do
         person.addresses << address
       end
 
-      it "returns the JSON notation to the document with ids" do
-        expect(location.atomic_selector).to eq(
-          {
-            "_id" => person.id,
-            "addresses._id" => address.id,
-            "addresses.locations._id" => location.id
-          }
-        )
+      context 'when the parent is persisted' do
+
+        let(:person) do
+          Person.create!
+        end
+
+        before do
+          person.should be_persisted
+        end
+
+        it "returns the JSON notation to the document with ids" do
+          expect(location.atomic_selector).to eq(
+            {
+              "_id" => person.id,
+              "addresses._id" => address.id,
+              "addresses.0.locations._id" => location.id
+            }
+          )
+        end
+      end
+
+      context 'when the parent is not persisted' do
+        before do
+          person.should be_new_record
+        end
+
+        it "returns the JSON notation to the document with ids" do
+          expect(location.atomic_selector).to eq(
+            {
+              "_id" => person.id,
+              "addresses._id" => address.id,
+              # This condition is technically acceptable for finds
+              # but probably won't work for modifications of 'locations'.
+              "addresses.locations._id" => location.id
+            }
+          )
+        end
       end
     end
   end
@@ -268,5 +320,46 @@ describe Mongoid::Atomic::Paths do
         end
       end
     end
+
+    context "when the same class is embedded in multiple associations" do
+
+      let(:customer) do
+        Customer.new
+      end
+
+      context "assignment after saving" do
+
+        it "correctly sets the association for the embedded class" do
+          pending 'MONGOID-5039'
+
+          customer.home_address = CustomerAddress.new
+          customer.work_address = CustomerAddress.new
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          expect(customer.work_address.atomic_path).to eq("work_address")
+
+          customer.save!
+
+          customer.home_address = CustomerAddress.new
+          customer.work_address = CustomerAddress.new
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          expect(customer.work_address.atomic_path).to eq("work_address")
+        end
+      end
+
+      context "inverse assignment" do
+
+        it "correctly returns the path for each embedded class" do
+          pending 'MONGOID-5039'
+
+          customer.work_address = CustomerAddress.new
+          customer.work_address.addressable = customer
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          expect(customer.work_address.atomic_path).to eq("work_address")
+        end
+      end
+    end
   end
 end

data/spec/mongoid/attributes/projector_data/embedded.yml

@@ -0,0 +1,105 @@
+- name: embedded field - inclusion
+  projection:
+    foo.bar: 1
+  
+  queries: &embedded-field-inclusion-expectations
+    # Top-level field is allowed as a container
+    - query: foo
+      allowed: true
+      
+    # Unmentioned field is not allowed
+    - query: bar
+      allowed: false
+      
+    # A peer to the field isn't allowed
+    - query: foo.buck
+      allowed: false
+      
+    # A more nested field is allowed
+    - query: foo.bar.baz
+      allowed: true
+
+- name: embedded field - exclusion
+  projection:
+    foo.bar: 0
+  
+  queries: &embedded-field-exclusion-expectations
+    # Top-level field is allowed
+    - query: foo
+      allowed: true
+    
+    # Unmentioned field is allowed
+    - query: bar
+      allowed: true
+      
+    # A peer to the excluded field is allowed
+    - query: foo.buck
+      allowed: true
+      
+    # A more nested field is not allowed
+    - query: foo.bar.baz
+      allowed: false
+
+- name: parent and child fields - inclusion
+  projection:
+    foo.bar: 1
+    foo.bar.baz: 1
+  
+  queries:
+    # Top-level field is allowed
+    - query: foo
+      allowed: true
+      
+    # Second-level field is allowed
+    - query: foo.bar
+      allowed: true
+    
+    # Third-level field is also allowed
+    - query: foo.bar.baz
+      allowed: true
+    
+    # Fourth-level field is still allowed
+    - query: foo.bar.baz.zzz
+      allowed: true
+    
+    # Unmentioned siblings are not allowed
+    - query: buck
+      allowed: false
+    - query: foo.buck
+      allowed: false
+    
+    # This sibling is under the second-level include and is allowed
+    - query: foo.bar.buck
+      allowed: true
+
+- name: parent and child fields - exclusion
+  projection:
+    foo.bar: 0
+    foo.bar.baz: 0
+  
+  queries:
+    # Top-level field is allowed
+    - query: foo
+      allowed: true
+      
+    # Second-level field is not allowed
+    - query: foo.bar
+      allowed: false
+    
+    # Third-level field is also not allowed
+    - query: foo.bar.baz
+      allowed: false
+    
+    # Fourth-level field is still not allowed
+    - query: foo.bar.baz.zzz
+      allowed: false
+    
+    # Unmentioned siblings are allowed
+    - query: buck
+      allowed: true
+    - query: foo.buck
+      allowed: true
+      
+    # This sibling is under the second-level exclude and is disallowed
+    - query: foo.bar.buck
+      allowed: false