mongoid 7.0.13 → 8.0.8

data/spec/mongoid/cacheable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Cacheable do
@@ -35,7 +37,7 @@ describe Mongoid::Cacheable do
     context "when persisted" do
 
       before do
-        document.save
+        document.save!
       end
 
       context "with updated_at" do
@@ -43,7 +45,7 @@ describe Mongoid::Cacheable do
         context "with the default cache_timestamp_format" do
 
           let!(:updated_at) do
-            document.updated_at.utc.to_s(:nsec)
+            document.updated_at.utc.to_formatted_s(:nsec)
           end
 
           it "has the id and updated_at key name" do
@@ -62,7 +64,7 @@ describe Mongoid::Cacheable do
           end
 
           let!(:updated_at) do
-            document.updated_at.utc.to_s(:number)
+            document.updated_at.utc.to_formatted_s(:number)
           end
 
           it "has the id and updated_at key name" do
@@ -101,7 +103,7 @@ describe Mongoid::Cacheable do
       end
 
       let!(:updated_at) do
-        agent.updated_at.utc.to_s(:nsec)
+        agent.updated_at.utc.to_formatted_s(:nsec)
       end
 
       it "has the id and updated_at key name" do

data/spec/mongoid/changeable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Changeable do
@@ -553,6 +555,56 @@ describe Mongoid::Changeable do
     end
   end
 
+  describe '#attribute_previously_was' do
+    let(:previous_title) do
+      "Grand Poobah"
+    end
+
+    let(:age) do
+      10
+    end
+
+    let(:person) do
+      Person.create!(title: previous_title, age: age)
+    end
+
+    let(:updated_title) do
+      "Captain Obvious"
+    end
+
+    before do
+      person.title = updated_title
+      person.save!
+    end
+
+    context 'when attribute changed' do
+      it "returns the old value" do
+        expect(person.send(:attribute_previously_was, "title")).to eq(previous_title)
+      end
+
+      it "allows access via (attribute)_was" do
+        expect(person.title_previously_was).to eq(previous_title)
+      end
+    end
+
+    context 'when attribute did not change' do
+      it "returns the same value" do
+        expect(person.send(:attribute_previously_was, "age")).to eq(age)
+      end
+
+      it "allows access via (attribute)_was" do
+        expect(person.age_previously_was).to eq(age)
+      end
+    end
+
+    it 'clears after reload' do
+      person.reload
+      expect(person.title_previously_was).to be_nil
+      expect(person.age_previously_was).to be_nil
+    end
+
+  end
+
   describe "#attribute_will_change!" do
 
     let(:aliases) do
@@ -695,7 +747,7 @@ describe Mongoid::Changeable do
     context "when the document is embedded" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:name) do
@@ -737,7 +789,7 @@ describe Mongoid::Changeable do
       context "when the field has not changed" do
 
         let(:person) do
-          Person.create(map: { name: "value" })
+          Person.create!(map: { name: "value" })
         end
 
         before do
@@ -752,7 +804,7 @@ describe Mongoid::Changeable do
       context "when the field is changed" do
 
         let(:person) do
-          Person.create(map: { name: "value" })
+          Person.create!(map: { name: "value" })
         end
 
         before do
@@ -767,7 +819,7 @@ describe Mongoid::Changeable do
       context "when a dynamic field is changed in place" do
 
         let(:person) do
-          Person.create(other_name: { full: {first: 'first', last: 'last'} })
+          Person.create!(other_name: { full: {first: 'first', last: 'last'} })
         end
 
         before do
@@ -795,11 +847,11 @@ describe Mongoid::Changeable do
     context "when a child has changed" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       before do
@@ -814,15 +866,15 @@ describe Mongoid::Changeable do
     context "when changed? has been called before child elements size change" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       let!(:location) do
-        address.locations.create(name: "home")
+        address.locations.create!(name: "home")
       end
 
       before do
@@ -854,7 +906,7 @@ describe Mongoid::Changeable do
       context "when adding via create" do
 
         before do
-          address.locations.create
+          address.locations.create!
         end
 
         it "returns false" do
@@ -866,15 +918,15 @@ describe Mongoid::Changeable do
     context "when a deeply embedded child has changed" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       let!(:location) do
-        address.locations.create(name: "home")
+        address.locations.create!(name: "home")
       end
 
       before do
@@ -889,7 +941,7 @@ describe Mongoid::Changeable do
     context "when a child is new" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:address) do
@@ -904,11 +956,11 @@ describe Mongoid::Changeable do
     context "when a deeply embedded child is new" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       let!(:location) do
@@ -946,6 +998,86 @@ describe Mongoid::Changeable do
       end
     end
 
+    context 'when habtm association changes' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts << user_account
+      end
+
+      it 'should not add to the changes or changed_attributes hash' do
+        person.changes.should == {}
+        person.changed_attributes.should == {}
+      end
+    end
+
+    context 'when habtm association _ids changes' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_account_ids << user_account._id
+      end
+
+      it 'should add to the changes or changed_attributes hash' do
+        person.changes.should == { "user_account_ids" => [ nil, [ user_account._id ] ] }
+        person.changed_attributes.should == { "user_account_ids" => nil }
+      end
+    end
+
+    context 'when assigning empty list to habtm association' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah", user_accounts: [user_account])
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts = []
+      end
+
+      it 'should not add to the changes or changed_attributes hash' do
+        person.changes.should == {}
+        person.changed_attributes.should == {}
+      end
+    end
+
+    context 'when assigning empty list to habtm association _ids' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah", user_accounts: [user_account])
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_account_ids = []
+      end
+
+      it 'should not add to the changes or changed_attributes hash' do
+        person.changes.should == { "user_account_ids" => [ [ user_account._id ], [] ] }
+        person.changed_attributes.should ==  { "user_account_ids" => [ user_account._id ] }
+      end
+    end
+
     context "when the document has not changed" do
 
       let(:acolyte) do
@@ -1234,7 +1366,7 @@ describe Mongoid::Changeable do
       context "when the document is persisted" do
 
         let(:person) do
-          Person.create(pets: true)
+          Person.create!(pets: true)
         end
 
         before do
@@ -1271,7 +1403,7 @@ describe Mongoid::Changeable do
       context "when the document is persisted" do
 
         let(:person) do
-          Person.create(title: "test")
+          Person.create!(title: "test")
         end
 
         before do
@@ -1369,7 +1501,7 @@ describe Mongoid::Changeable do
   context "when only embedded documents change" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     context "when the child is an embeds one" do
@@ -1428,7 +1560,7 @@ describe Mongoid::Changeable do
       context "when a child is modified" do
 
         let!(:address) do
-          person.addresses.create(street: "jakobstr.")
+          person.addresses.create!(street: "jakobstr.")
         end
 
         before do
@@ -1443,7 +1575,7 @@ describe Mongoid::Changeable do
       context "when no child is modified" do
 
         let!(:address) do
-          person.addresses.create(street: "skalitzerstr.")
+          person.addresses.create!(street: "skalitzerstr.")
         end
 
         it "does not flag the parent as changed" do
@@ -1456,7 +1588,7 @@ describe Mongoid::Changeable do
   context "when changing a hash of hashes" do
 
     let!(:person) do
-      Person.create(map: { "test" => {}})
+      Person.create!(map: { "test" => {}})
     end
 
     before do
@@ -1473,15 +1605,15 @@ describe Mongoid::Changeable do
   context "when modifying a many to many key" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:preference) do
-      Preference.create(name: "dirty")
+      Preference.create!(name: "dirty")
     end
 
     before do
-      person.update_attributes(preference_ids: [ preference.id ])
+      person.update_attributes!(preference_ids: [ preference.id ])
     end
 
     it "records the foreign key dirty changes" do
@@ -1494,7 +1626,7 @@ describe Mongoid::Changeable do
   context "when accessing an array field" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:from_db) do
@@ -1520,7 +1652,7 @@ describe Mongoid::Changeable do
   context "when reloading an unchanged document" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:from_db) do
@@ -1539,7 +1671,7 @@ describe Mongoid::Changeable do
   context "when fields are getting changed" do
 
     let(:person) do
-      Person.create(
+      Person.create!(
         title: "MC",
         some_dynamic_field: 'blah'
       )
@@ -1619,26 +1751,31 @@ describe Mongoid::Changeable do
     context "when the document is persisted" do
 
       let!(:acolyte) do
-        Acolyte.create(name: "callback-test")
+        Acolyte.create!(name: "callback-test")
       end
 
       before do
         Acolyte.set_callback(:save, :after, if: :callback_test?) do |doc|
-          doc[:changed_in_callback] = doc.changes.dup
+          doc[:changed_in_after_callback] = doc.changes.dup
+        end
+
+        Acolyte.set_callback(:save, :before, if: :callback_test?) do |doc|
+          doc[:changed_in_before_callback] = doc.changes.dup
         end
       end
 
       after do
         Acolyte._save_callbacks.select do |callback|
-          callback.kind == :after
+          [:before, :after].include?(callback.kind)
         end.each do |callback|
           Acolyte._save_callbacks.delete(callback)
         end
       end
 
-      it "retains the changes until after all callbacks" do
+      it "does not retain the changes until after all callbacks" do
         acolyte.update_attribute(:status, "testing")
-        expect(acolyte.changed_in_callback).to eq({ "status" => [ nil, "testing" ] })
+        expect(acolyte.changed_in_before_callback).to eq({"status"=>[nil, "testing"]})
+        expect(acolyte.changed_in_after_callback).to eq({  })
       end
     end
 
@@ -1650,21 +1787,26 @@ describe Mongoid::Changeable do
 
       before do
         Acolyte.set_callback(:save, :after, if: :callback_test?) do |doc|
-          doc[:changed_in_callback] = doc.changes.dup
+          doc[:changed_after_in_callback] = doc.changes.dup
+        end
+
+        Acolyte.set_callback(:save, :before, if: :callback_test?) do |doc|
+          doc[:changed_before_in_callback] = doc.changes.dup
         end
       end
 
       after do
         Acolyte._save_callbacks.select do |callback|
-          callback.kind == :after
+          [:before, :after].include?(callback.kind)
         end.each do |callback|
           Acolyte._save_callbacks.delete(callback)
         end
       end
 
-      it "retains the changes until after all callbacks" do
-        acolyte.save
-        expect(acolyte.changed_in_callback["name"]).to eq([ nil, "callback-test" ])
+      it "does not retain the changes until after all callbacks" do
+        acolyte.save!
+        expect(acolyte.changed_before_in_callback["name"]).to eq([ nil, "callback-test" ])
+        expect(acolyte.changed_after_in_callback["name"]).to be_nil
       end
     end
   end
@@ -1672,7 +1814,7 @@ describe Mongoid::Changeable do
   context "when associations are getting changed" do
 
     let(:person) do
-      Person.create(addresses: [ Address.new ])
+      Person.create!(addresses: [ Address.new ])
     end
 
     before do
@@ -1689,7 +1831,7 @@ describe Mongoid::Changeable do
     context 'when persisting the root document' do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       it 'is not marked as changed' do
@@ -1713,7 +1855,7 @@ describe Mongoid::Changeable do
         context 'when building the lowest level document' do
 
           before do
-            person.save
+            person.save!
           end
 
           let!(:code) do
@@ -1735,7 +1877,7 @@ describe Mongoid::Changeable do
           context 'when saving the hierarchy' do
 
             before do
-              person.save
+              person.save!
             end
 
             let(:reloaded) do
@@ -1757,7 +1899,7 @@ describe Mongoid::Changeable do
               end
 
               before do
-                reloaded.save
+                reloaded.save!
               end
 
               it 'saves the deepest embedded document' do