mongoid 6.1.0 → 6.1.1

data/spec/mongoid/persistable/deletable_spec.rb

@@ -213,6 +213,21 @@ describe Mongoid::Persistable::Deletable do
           expect(removed).to eq(1)
         end
       end
+
+      context "when the conditions need to be mongoized" do
+
+        let!(:removed) do
+          Person.delete_all(id: person.id)
+        end
+
+        it "removes the matching documents" do
+          expect(Person.count).to eq(1)
+        end
+
+        it "returns the number of documents removed" do
+          expect(removed).to eq(1)
+        end
+      end
     end
   end
 end

data/spec/mongoid/persistable/settable_spec.rb

@@ -230,6 +230,22 @@ describe Mongoid::Persistable::Settable do
       end
     end
 
+    context 'when the field is assigned with nil' do
+
+      before do
+        church.location = nil
+        church.set('location.neighborhood' => 'Kreuzberg')
+      end
+
+      it 'updates the hash while keeping existing key and values locally' do
+        expect(church.location).to eq({'neighborhood' => 'Kreuzberg'})
+      end
+
+      it 'updates the hash in the database' do
+        expect(church.reload.location).to eq({'neighborhood' => 'Kreuzberg'})
+      end
+    end
+
     context 'when the field type is String' do
 
       before do

data/spec/mongoid/persistence_context_spec.rb

@@ -211,7 +211,28 @@ describe Mongoid::PersistenceContext do
       end
 
       it 'keeps the other options of the persistence context' do
-        expect(persistence_context.collection(Person.new).client.options[:read]).to eq(options[:read])
+        expect(persistence_context.collection(Person.new).options[:read]).to eq(options[:read])
+      end
+
+      context 'when the parent object has a client set' do
+
+        let(:file) do
+          File.join(File.dirname(__FILE__), "..", "config", "mongoid.yml")
+        end
+
+        before do
+          Mongoid::Clients.clear
+          Mongoid.load!(file, :test)
+          Person.store_in(client: 'reports')
+        end
+
+        after do
+          Person.reset_storage_options!
+        end
+
+        it 'uses the client of the parent object' do
+          expect(persistence_context.collection(Person.new).client.database.name).to eq('reports')
+        end
       end
     end
 

data/spec/mongoid/relations/bindings/referenced/many_to_many_spec.rb

@@ -43,11 +43,11 @@ describe Mongoid::Relations::Bindings::Referenced::ManyToMany do
       end
 
       it "syncs the base" do
-        expect(person).to be_synced("preference_ids")
+        expect(person._synced?("preference_ids")).to be(true)
       end
 
       it "syncs the inverse" do
-        expect(preference_two).to be_synced("person_ids")
+        expect(preference_two._synced?("person_ids")).to be(true)
       end
     end
 
@@ -98,11 +98,11 @@ describe Mongoid::Relations::Bindings::Referenced::ManyToMany do
       end
 
       it "syncs the base" do
-        expect(person).to be_synced("preference_ids")
+        expect(person._synced?("preference_ids")).to be(true)
       end
 
       it "syncs the inverse" do
-        expect(preference).to be_synced("person_ids")
+        expect(preference._synced?("person_ids")).to be(true)
       end
     end
 

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

@@ -428,22 +428,40 @@ describe Mongoid::Relations::Embedded::Many do
     context "when replacing an existing relation" do
 
       let(:person) do
-        Person.create(addresses: [
+        Person.create(addresses: addresses)
+      end
+
+      let(:addresses) do
+        [
           Address.new(street: "1st St"),
           Address.new(street: "2nd St")
-        ])
+        ]
       end
 
       let(:address) do
         Address.new(street: "3rd St")
       end
 
-      before do
-        person.addresses = [ address ]
+      context "when the replaced relation is different from the existing relation" do
+
+        before do
+          person.addresses = [ address ]
+        end
+
+        it "deletes the old documents" do
+          expect(person.reload.addresses).to eq([ address ])
+        end
       end
 
-      it "deletes the old documents" do
-        expect(person.reload.addresses).to eq([ address ])
+      context "when the replaced relation is identical to the existing relation" do
+
+        before do
+          person.addresses = addresses
+        end
+
+        it "does nothing" do
+          expect(person.reload.addresses).to eq(addresses)
+        end
       end
     end
 

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

@@ -5,7 +5,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
   before(:all) do
     Mongoid.raise_not_found_error = true
     Person.autosave(Person.relations["preferences"].merge!(autosave: true))
-    Person.synced(Person.relations["preferences"])
+    Person._synced(Person.relations["preferences"])
   end
 
   after(:all) do

data/spec/mongoid/relations/synchronization_spec.rb

@@ -4,7 +4,7 @@ describe Mongoid::Relations::Synchronization do
 
   before(:all) do
     Mongoid.raise_not_found_error = true
-    Person.synced(Person.relations["preferences"])
+    Person._synced(Person.relations["preferences"])
   end
 
   after(:all) do
@@ -12,6 +12,52 @@ describe Mongoid::Relations::Synchronization do
     Person.reset_callbacks(:destroy)
   end
 
+  describe 'Model loading' do
+
+    let(:model_synced) do
+      class TestModel
+        include Mongoid::Document
+        field :_synced
+      end
+    end
+
+    let(:model_synced?) do
+      class TestModel
+        include Mongoid::Document
+        field :_synced?
+      end
+    end
+    
+    let(:model_syncable?) do
+      class TestModel
+        include Mongoid::Document
+        field :_syncable?
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :TestModel)
+    end
+
+    it 'prohibits the use of :_sycned as an attribute' do
+      expect {
+        model_synced
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+
+    it 'prohibits the use of :_synced? as an attribute' do
+      expect {
+        model_synced?
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+
+    it 'prohibits the use of :_syncable? as an attribute' do
+      expect {
+        model_syncable?
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+  end
+
   describe ".update_inverse_keys" do
 
     let(:agent) do
@@ -119,7 +165,7 @@ describe Mongoid::Relations::Synchronization do
     end
 
     it "resets the synced flag" do
-      expect(person.synced["preference_ids"]).to be false
+      expect(person._synced["preference_ids"]).to be false
     end
 
     context "when subsequently setting with keys" do

data/spec/mongoid/relations/touchable_spec.rb

@@ -227,6 +227,44 @@ describe Mongoid::Relations::Touchable do
         end
       end
 
+      context "when the parent of embedded doc has cascade callbacks" do
+
+        let!(:book) do
+          Book.new
+        end
+
+        before do
+          book.pages.new
+          book.save
+          book.unset(:updated_at)
+          book.pages.first.touch
+        end
+
+        it "touches the parent document" do
+          expect(book.updated_at).to be_within(5).of(Time.now)
+        end
+      end
+
+      context "when multiple embedded docs with cascade callbacks" do
+
+        let!(:book) do
+          Book.new
+        end
+
+        before do
+          2.times { book.pages.new }
+          book.save
+          book.unset(:updated_at)
+          book.pages.first.content  = "foo"
+          book.pages.second.content = "bar"
+          book.pages.first.touch
+        end
+
+        it "touches the parent document" do
+          expect(book.updated_at).to be_within(5).of(Time.now)
+        end
+      end
+
       context "when the relation is nil" do
 
         let!(:agent) do
@@ -343,6 +381,7 @@ describe Mongoid::Relations::Touchable do
         end
 
         it "does not persist other attribute changes" do
+          expect(band.name).to eq('Nocebo')
           expect(band.reload.name).not_to eq('Nocebo')
         end
       end
@@ -354,6 +393,7 @@ describe Mongoid::Relations::Touchable do
         end
 
         it "does not persist other attribute changes" do
+          expect(band.name).to eq('Nocebo')
           expect(band.reload.name).not_to eq('Nocebo')
         end
       end

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -2424,6 +2424,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
     before do
       Person.validates_uniqueness_of(:username)
+      Person.index({ ssn: 1 }, { unique: true })
       Person.create_indexes
     end
 
@@ -2433,6 +2434,7 @@ describe Mongoid::Validatable::UniquenessValidator do
 
     after do
       Person.reset_callbacks(:validate)
+      Person.collection.drop
     end
 
     it "transfers the options to the cloned client" do

data/spec/spec_helper.rb

@@ -36,7 +36,7 @@ require 'support/authorization'
 require 'support/expectations'
 
 # Give MongoDB time to start up on the travis ci environment.
-if (ENV['CI'] == 'travis')
+if (ENV['CI'] == 'travis' || ENV['CI'] == 'evergreen')
   starting = true
   client = Mongo::Client.new(['127.0.0.1:27017'])
   while starting

metadata

@@ -1,36 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
-  ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE2MTIwMTE0MDcxMloXDTE3MTIwMTE0MDcxMlowQjEUMBIGA1UEAwwL
-  ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
-  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
-  bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
-  IQ+iI/9+E+ArJ+rbGV3dDPQ+SLl3mLT+vXjfjcxMqI2IW6UuVtt2U3Rxd4QU0kdT
-  JxmcPYs5fDN6BgYc6XXgUjy3m+Kwha2pGctdciUOwEfOZ4RmNRlEZKCMLRHdFP8j
-  4WTnJSGfXDiuoXICJb5yOPOZPuaapPSNXp93QkUdsqdKC32I+KMpKKYGBQ6yisfA
-  5MyVPPCzLR1lP5qXVGJPnOqUAkvEUfCahg7EP9tI20qxiXrR6TSEraYhIFXL0EGY
-  u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
-  BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
-  QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAKBDaVkycCUC1zMfpAkXIgWtji2Nr2ZygYQR53AgxOaE
-  7nqxdh5Lh8pnfwa71/ucrZFJt+g/mEhen9lFNmcizvpP43Hh4rYf8j6T8Y+mQ6tr
-  sp5xWiv93DlLXGmas0hv9VRYDvV1vLFaG05FHOAZKdo6pD2t6jNyMSAn4fMHKctw
-  UoYN5FLt84jacRQF5nhy9gBhfgvA19LcjeMLQC11x3fykDLzCXF2wEe5Q5iYaWvb
-  cGiNQIiHBj/9/xHfOyOthBPUevTiVnuffarDr434z/LGLwYzgaG5EcJFvZqpvUpP
-  fGcAPtAZUMGLXwcOB1BJEFkDxUQIJiEpSmf4YzzZhEM=
-  -----END CERTIFICATE-----
-date: 2017-01-26 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -258,6 +236,7 @@ files:
 - lib/mongoid/matchable/ne.rb
 - lib/mongoid/matchable/nin.rb
 - lib/mongoid/matchable/or.rb
+- lib/mongoid/matchable/regexp.rb
 - lib/mongoid/matchable/size.rb
 - lib/mongoid/persistable.rb
 - lib/mongoid/persistable/creatable.rb
@@ -631,6 +610,7 @@ files:
 - spec/mongoid/criteria/queryable/extensions/nil_class_spec.rb
 - spec/mongoid/criteria/queryable/extensions/object_spec.rb
 - spec/mongoid/criteria/queryable/extensions/range_spec.rb
+- spec/mongoid/criteria/queryable/extensions/regexp_raw_spec.rb
 - spec/mongoid/criteria/queryable/extensions/regexp_spec.rb
 - spec/mongoid/criteria/queryable/extensions/set_spec.rb
 - spec/mongoid/criteria/queryable/extensions/string_spec.rb
@@ -742,6 +722,7 @@ files:
 - spec/mongoid/matchable/ne_spec.rb
 - spec/mongoid/matchable/nin_spec.rb
 - spec/mongoid/matchable/or_spec.rb
+- spec/mongoid/matchable/regexp_spec.rb
 - spec/mongoid/matchable/size_spec.rb
 - spec/mongoid/matchable_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb
@@ -862,7 +843,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongoid
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Elegant Persistence in Ruby for MongoDB.
@@ -1123,6 +1104,7 @@ test_files:
 - spec/mongoid/criteria/queryable/extensions/nil_class_spec.rb
 - spec/mongoid/criteria/queryable/extensions/object_spec.rb
 - spec/mongoid/criteria/queryable/extensions/range_spec.rb
+- spec/mongoid/criteria/queryable/extensions/regexp_raw_spec.rb
 - spec/mongoid/criteria/queryable/extensions/regexp_spec.rb
 - spec/mongoid/criteria/queryable/extensions/set_spec.rb
 - spec/mongoid/criteria/queryable/extensions/string_spec.rb
@@ -1234,6 +1216,7 @@ test_files:
 - spec/mongoid/matchable/ne_spec.rb
 - spec/mongoid/matchable/nin_spec.rb
 - spec/mongoid/matchable/or_spec.rb
+- spec/mongoid/matchable/regexp_spec.rb
 - spec/mongoid/matchable/size_spec.rb
 - spec/mongoid/matchable_spec.rb
 - spec/mongoid/persistable/creatable_spec.rb

data.tar.gz.sig

@@ -1 +0,0 @@
-xp���ewE���lSeCQݔ�oNѨ+jSF7���0p�*=-2U
����?ЌG�E��`a#K�|#�i�e��Z���cB�?��l=�LL�Q��K�>�bB#w�{B �q�b>$2��(ٛL� k��G���_	˸,,��%Z�}n��k�2빎$Ґ��&I���"�$oͮ,cIt&b2 :�ܭ���y����vz؟��k�;����l�w>��\�=E��<�ˬ����o��a��

metadata.gz.sig

@@ -1 +0,0 @@
-'���$l��Փ����Z�pkSu�%�)@���Z�$�0�kj�b+�t��tQ�!�Mȹ�����K�d�L0��AS��H���՝���#k@y2�/[`�I�?m� �
�V�]U��L��f�`-aЉ�������A>��<�`�x��G[��W0懍2�)�k���6�blW��!����75�|X������f8Z��)+D�6
幩�2��T�N�H.^0a����&5\���L�L����C.l