mongoid 5.0.1 → 5.0.2

data/spec/mongoid/query_cache_spec.rb

@@ -75,6 +75,55 @@ describe Mongoid::QueryCache do
         end
       end
 
+      context "when the first query has no limit" do
+
+        let(:game) do
+          Game.create!(name: "2048")
+        end
+
+        before do
+          game.ratings.where(:value.gt => 5).asc(:id).all.to_a
+        end
+
+        context "when the next query has a limit" do
+
+          it "uses the cache" do
+            expect_no_queries do
+              game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
+            end
+          end
+        end
+      end
+
+      context "when the first query has a limit" do
+
+        let(:game) do
+          Game.create!(name: "2048")
+        end
+
+        before do
+          game.ratings.where(:value.gt => 5).limit(3).asc(:id).all.to_a
+        end
+
+        context "when the next query has a limit" do
+
+          it "queries again" do
+            expect_query(1) do
+              game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
+            end
+          end
+        end
+
+        context "when the new query does not have a limit" do
+
+          it "queries again" do
+            expect_query(1) do
+              game.ratings.where(:value.gt => 5).asc(:id).to_a
+            end
+          end
+        end
+      end
+
       context "when querying only the first" do
 
         let(:game) do
@@ -94,8 +143,8 @@ describe Mongoid::QueryCache do
 
       context "when limiting the result" do
 
-        it "queries again" do
-          expect_query(1) do
+        it "does not query again" do
+          expect_query(0) do
             Band.limit(2).all.to_a
           end
         end

data/spec/mongoid/relations/accessors_spec.rb

@@ -749,4 +749,73 @@ describe Mongoid::Relations::Accessors do
       end
     end
   end
+
+  context 'when setting the relation more than once' do
+
+    let(:person) do
+      Person.create
+    end
+
+    context 'when the relation is a references one' do
+
+      let(:game) do
+        Game.create
+      end
+
+      before do
+        person.game = game
+        game.person = person
+      end
+
+      it 'allows the object to be set twice' do
+        expect(person.game = game).to be(game)
+      end
+    end
+
+    context 'when the relation is a references many' do
+
+      let!(:preference) do
+        Preference.create(name: "Setting")
+      end
+
+      before do
+        person.preferences << Preference.last
+      end
+
+      it 'allows the object to be set twice' do
+        expect(person.preferences << Preference.last).to be_a(Array)
+      end
+    end
+
+    context 'when the relation is an embeds one' do
+
+      let!(:name) do
+        Name.new
+      end
+
+      before do
+        person.name = name
+        name.person = person
+      end
+
+      it 'allows the object to be set twice' do
+        expect(person.name = name).to be(name)
+      end
+    end
+
+    context 'when the relation is an embeds many' do
+
+      let!(:address) do
+        Address.new
+      end
+
+      before do
+        person.addresses << address
+      end
+
+      it 'allows the object to be set twice' do
+        expect(person.addresses << address).to be_a(Array)
+      end
+    end
+  end
 end

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

@@ -1545,6 +1545,38 @@ describe Mongoid::Relations::Embedded::Many do
           person.addresses.create!(street: "1")
         }.to raise_error(Mongoid::Errors::Validations)
       end
+
+      context 'when the presence of the embedded relation is validated' do
+
+        before do
+          class Book
+            validates :pages, presence: true
+          end
+        end
+
+        let(:book) do
+          Book.new.tap do |b|
+            b.pages = [Page.new]
+            b.save!
+          end
+        end
+
+        let(:num_pages) do
+          book.pages.size
+        end
+
+        let(:reloaded) do
+          book.reload
+        end
+
+        before do
+          begin; book.update_attributes!({"pages"=>nil}); rescue; end
+        end
+
+        it 'does not delete the embedded relation' do
+          expect(reloaded.pages.size).to eq(num_pages)
+        end
+      end
     end
   end
 
@@ -3531,6 +3563,37 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
+  context "when the association has an order defined" do
+
+    let(:person) do
+      Person.create
+    end
+
+    let(:message_one) do
+      Message.new(priority: 5, body: 'This is a test')
+    end
+
+    let(:message_two) do
+      Message.new(priority: 10, body: 'This is a test')
+    end
+
+    let(:message_three) do
+      Message.new(priority: 20, body: 'Zee test')
+    end
+
+    before do
+      person.messages.push(message_one, message_two, message_three)
+    end
+
+    let(:criteria) do
+      person.messages.order_by(:body.asc, :priority.desc)
+    end
+
+    it "properly orders the related objects" do
+      expect(criteria.to_a).to eq([message_two, message_one, message_three])
+    end
+  end
+
   context "when using dot notation in a criteria" do
 
     let(:person) do

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

@@ -768,6 +768,37 @@ describe Mongoid::Relations::Embedded::One do
     end
   end
 
+  describe "when the relationship is polymorphic" do
+
+    context "when updating an aliased embedded document" do
+
+      context "when the embedded document inherits its relationship" do
+
+        let(:courier_job) do
+          CourierJob.create
+        end
+
+        let(:old_child) do
+          ShipmentAddress.new
+        end
+
+        let(:new_child) do
+          ShipmentAddress.new
+        end
+
+        before do
+          courier_job.drop_address = old_child
+          courier_job.update_attribute(:drop_address, new_child)
+          courier_job.reload
+        end
+
+        it "the child is embedded correctly" do
+          expect(courier_job.drop_address).to eq(new_child)
+        end
+      end
+    end
+  end
+
   describe ".embedded?" do
 
     it "returns true" do
@@ -1019,4 +1050,18 @@ describe Mongoid::Relations::Embedded::One do
       end
     end
   end
+
+  context "when parent validation of child is set to false" do
+
+    let(:building) do
+      building = Building.create
+      building.building_address = BuildingAddress.new
+      building.save
+      building.reload
+    end
+
+    it "parent successfully embeds an invalid child" do
+      expect(building.building_address).to be_a(BuildingAddress)
+    end
+  end
 end

data/spec/mongoid/relations/metadata_spec.rb

@@ -586,6 +586,22 @@ describe Mongoid::Relations::Metadata do
     end
   end
 
+  context "when the association is polymorphic" do
+
+    let(:metadata) do
+      described_class.new(
+        name: :ratable,
+        relation: Mongoid::Relations::Referenced::In,
+        polymorphic: true,
+        inverse_class_name: "Rating"
+      )
+    end
+
+    it "returns the polymorphic class name" do
+      expect(metadata.class_name).to eq("Ratable")
+    end
+  end
+
   describe "#destructive?" do
 
     context "when the relation has a destructive dependent option" do

data/spec/mongoid/relations/referenced/one_spec.rb

@@ -1213,4 +1213,28 @@ describe Mongoid::Relations::Referenced::One do
       end
     end
   end
+
+  context "when dependent is set to delete for child" do
+
+    context "when autobuild is true for child" do
+
+      let(:explosion) do
+        Explosion.create
+      end
+
+      let(:bomb) do
+        bomb = Bomb.create
+        bomb.explosion = explosion
+        bomb
+      end
+
+      let(:clear_child) do
+        bomb.explosion.clear
+      end
+
+      it "clearing the child raises no error" do
+        expect{ clear_child }.not_to raise_error
+      end
+    end
+  end
 end

data/spec/mongoid/tasks/database_spec.rb

@@ -132,6 +132,25 @@ describe "Mongoid::Tasks::Database" do
     it "returns the removed indexes" do
       expect(removed_indexes).to be_empty
     end
+
+    context 'when the index is a text index', if: non_legacy_server? do
+
+      before do
+        class Band
+          index origin: Mongo::Index::TEXT
+        end
+        Mongoid::Tasks::Database.create_indexes([Band])
+        Mongoid::Tasks::Database.remove_undefined_indexes([Band])
+      end
+
+      let(:indexes) do
+        Band.collection.indexes
+      end
+
+      it 'does not delete the text index' do
+        expect(indexes.find { |i| i['name'] == 'origin_text' }).not_to be_nil
+      end
+    end
   end
 
   describe ".remove_indexes" do

data/spec/spec_helper.rb

@@ -4,13 +4,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 MODELS = File.join(File.dirname(__FILE__), "app/models")
 $LOAD_PATH.unshift(MODELS)
 
-if ENV["CI"]
-  require "coveralls"
-  Coveralls.wear! do
-    add_filter "spec"
-  end
-end
-
 require "action_controller"
 require "mongoid"
 require "rspec"
@@ -48,7 +41,7 @@ if (ENV['CI'] == 'travis')
   client = Mongo::Client.new(['127.0.0.1:27017'])
   while starting
     begin
-      client.command(Mongo::Server::Monitor::STATUS)
+      client.command(Mongo::Server::Monitor::Connection::ISMASTER)
       break
     rescue Mongo::Error::OperationFailure => e
       sleep(2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   ZIvvwAhgCjVW5QCi2I1noxXLmtZ3XDawWu8kaGtu8giHXcwL3941m8hvFZ/Wr9Yi
   JvcXJt2a4/JvwnIs2hmKuyfhZmB9HEE5wQQaCMnnC14=
   -----END CERTIFICATE-----
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -387,6 +387,7 @@ files:
 - spec/app/models/bed.rb
 - spec/app/models/big_palette.rb
 - spec/app/models/birthday.rb
+- spec/app/models/bomb.rb
 - spec/app/models/book.rb
 - spec/app/models/breed.rb
 - spec/app/models/browser.rb
@@ -413,6 +414,7 @@ files:
 - spec/app/models/contractor.rb
 - spec/app/models/cookie.rb
 - spec/app/models/country_code.rb
+- spec/app/models/courier_job.rb
 - spec/app/models/definition.rb
 - spec/app/models/description.rb
 - spec/app/models/dictionary.rb
@@ -434,6 +436,7 @@ files:
 - spec/app/models/event.rb
 - spec/app/models/exhibition.rb
 - spec/app/models/exhibitor.rb
+- spec/app/models/explosion.rb
 - spec/app/models/eye.rb
 - spec/app/models/eye_bowl.rb
 - spec/app/models/face.rb
@@ -522,6 +525,7 @@ files:
 - spec/app/models/service.rb
 - spec/app/models/shape.rb
 - spec/app/models/shelf.rb
+- spec/app/models/shipment_address.rb
 - spec/app/models/shipping_container.rb
 - spec/app/models/shipping_pack.rb
 - spec/app/models/shop.rb
@@ -838,6 +842,7 @@ test_files:
 - spec/app/models/bed.rb
 - spec/app/models/big_palette.rb
 - spec/app/models/birthday.rb
+- spec/app/models/bomb.rb
 - spec/app/models/book.rb
 - spec/app/models/breed.rb
 - spec/app/models/browser.rb
@@ -864,6 +869,7 @@ test_files:
 - spec/app/models/contractor.rb
 - spec/app/models/cookie.rb
 - spec/app/models/country_code.rb
+- spec/app/models/courier_job.rb
 - spec/app/models/definition.rb
 - spec/app/models/description.rb
 - spec/app/models/dictionary.rb
@@ -885,6 +891,7 @@ test_files:
 - spec/app/models/event.rb
 - spec/app/models/exhibition.rb
 - spec/app/models/exhibitor.rb
+- spec/app/models/explosion.rb
 - spec/app/models/eye.rb
 - spec/app/models/eye_bowl.rb
 - spec/app/models/face.rb
@@ -973,6 +980,7 @@ test_files:
 - spec/app/models/service.rb
 - spec/app/models/shape.rb
 - spec/app/models/shelf.rb
+- spec/app/models/shipment_address.rb
 - spec/app/models/shipping_container.rb
 - spec/app/models/shipping_pack.rb
 - spec/app/models/shop.rb