mongoid-history 0.8.0 → 0.8.1

data/spec/unit/attributes/destroy_spec.rb

@@ -1,20 +1,25 @@
 require 'spec_helper'
 
 describe Mongoid::History::Attributes::Destroy do
-  let(:model_one) do
-    Class.new do
+  before :each do
+    class ModelOne
       include Mongoid::Document
       include Mongoid::History::Trackable
+
       store_in collection: :model_ones
+
       field :foo
       field :b, as: :bar
-      def self.name
-        'ModelOne'
-      end
+
+      track_history on: :foo, modifier_field_optional: true
     end
   end
 
-  let(:obj_one) { model_one.new }
+  after :each do
+    Object.send(:remove_const, :ModelOne)
+  end
+
+  let(:obj_one) { ModelOne.new }
   let(:base) { described_class.new(obj_one) }
   subject { base }
 
@@ -22,50 +27,57 @@ describe Mongoid::History::Attributes::Destroy do
     subject { base.attributes }
 
     describe '#fields' do
-      before(:each) do
-        model_one.instance_variable_set(:@history_trackable_options, nil)
-        model_one.track_history on: :foo
+      before :each do
         obj_one.save!
       end
-      let(:obj_one) { model_one.new(foo: 'Foo', bar: 'Bar') }
+
+      let(:obj_one) { ModelOne.new(foo: 'Foo', bar: 'Bar') }
       it { is_expected.to eq('_id' => [obj_one._id, nil], 'foo' => ['Foo', nil], 'version' => [1, nil]) }
     end
 
     describe '#insert_embeds_one_changes' do
-      before(:all) do
-        # Need class name constant. So, defining class like this
+      before :each do
         class ModelTwo
           include Mongoid::Document
           include Mongoid::History::Trackable
+
           store_in collection: :model_twos
+
           embeds_one :emb_two
-          track_history on: :fields
+
+          track_history on: :fields, modifier_field_optional: true
         end
 
         class EmbTwo
           include Mongoid::Document
+
           field :em_foo
           field :em_bar
+
           embedded_in :model_two
         end
       end
 
-      before(:each) { ModelTwo.clear_trackable_memoization }
+      after :each do
+        Object.send(:remove_const, :ModelTwo)
+        Object.send(:remove_const, :EmbTwo)
+      end
+
       let(:obj_two) { ModelTwo.new(emb_two: emb_obj_two) }
       let(:emb_obj_two) { EmbTwo.new(em_foo: 'Em-Foo', em_bar: 'Em-Bar') }
       let(:base) { described_class.new(obj_two) }
 
       context 'when relation tracked' do
-        before(:each) do
-          ModelTwo.track_history on: :emb_two
+        before :each do
+          ModelTwo.track_history on: :emb_two, modifier_field_optional: true
           obj_two.save!
         end
         it { expect(subject['emb_two']).to eq [{ '_id' => emb_obj_two._id, 'em_foo' => 'Em-Foo', 'em_bar' => 'Em-Bar' }, nil] }
       end
 
       context 'when relation not tracked' do
-        before(:each) do
-          ModelTwo.track_history on: :fields
+        before :each do
+          ModelTwo.track_history on: :fields, modifier_field_optional: true
           allow(ModelTwo).to receive(:dynamic_enabled?) { false }
           obj_two.save!
         end
@@ -73,133 +85,136 @@ describe Mongoid::History::Attributes::Destroy do
       end
 
       context 'when relation with alias' do
-        before(:all) do
-          # Need class name constant. So, defining class like this
+        before :each do
           class ModelThree
             include Mongoid::Document
             include Mongoid::History::Trackable
+
             store_in collection: :model_threes
             embeds_one :emb_three, store_as: :emtr
+
+            track_history on: :emb_three, modifier_field_optional: true
           end
 
           class EmbThree
             include Mongoid::Document
+
             field :em_foo
             embedded_in :model_three
           end
         end
 
-        before(:each) do
-          ModelThree.instance_variable_set(:@history_trackable_options, nil)
-          ModelThree.track_history on: :emb_three
+        after :each do
+          Object.send(:remove_const, :ModelThree)
+          Object.send(:remove_const, :EmbThree)
+        end
+
+        before :each do
           obj_three.save!
         end
 
         let(:obj_three) { ModelThree.new(emb_three: emb_obj_three) }
         let(:emb_obj_three) { EmbThree.new(em_foo: 'Em-Foo') }
         let(:base) { described_class.new(obj_three) }
-        it { expect(subject['emb_three']).to eq [{ '_id' => emb_obj_three._id, 'em_foo' => 'Em-Foo' }, nil] }
 
-        after(:all) do
-          Object.send(:remove_const, :ModelThree)
-          Object.send(:remove_const, :EmbThree)
-        end
+        it { expect(subject['emb_three']).to eq [{ '_id' => emb_obj_three._id, 'em_foo' => 'Em-Foo' }, nil] }
       end
 
       context 'relation with permitted attributes' do
-        before(:each) do
-          ModelTwo.track_history on: [{ emb_two: :em_foo }]
+        before :each do
+          ModelTwo.track_history on: [{ emb_two: :em_foo }], modifier_field_optional: true
           obj_two.save!
         end
+
         it { expect(subject['emb_two']).to eq [{ '_id' => emb_obj_two._id, 'em_foo' => 'Em-Foo' }, nil] }
       end
 
       context 'when relation object not built' do
-        before(:each) do
-          ModelTwo.track_history on: :emb_two
+        before :each do
+          ModelTwo.track_history on: :emb_two, modifier_field_optional: true
           obj_two.save!
         end
+
         let(:obj_two) { ModelTwo.new }
         it { expect(subject['emb_two']).to be_nil }
       end
-
-      after(:all) do
-        Object.send(:remove_const, :ModelTwo)
-        Object.send(:remove_const, :EmbTwo)
-      end
     end
 
     describe '#insert_embeds_many_changes' do
       context 'Case 1:' do
-        before(:all) do
+        before :each do
           class ModelTwo
             include Mongoid::Document
             include Mongoid::History::Trackable
+
             embeds_many :em_twos
             track_history on: :fields
           end
 
           class EmTwo
             include Mongoid::Document
+
             field :em_foo
             field :em_bar
+
             embedded_in :model_two
           end
         end
 
+        after :each do
+          Object.send(:remove_const, :ModelTwo)
+          Object.send(:remove_const, :EmTwo)
+        end
+
         let(:obj_two) { ModelTwo.new(em_twos: [em_obj_two]) }
         let(:em_obj_two) { EmTwo.new(em_foo: 'Em-Foo', em_bar: 'Em-Bar') }
         let(:base) { described_class.new(obj_two) }
 
         context 'when relation tracked' do
-          before(:each) do
-            ModelTwo.clear_trackable_memoization
+          before :each do
             ModelTwo.track_history on: :em_twos
           end
           it { expect(subject['em_twos']).to eq [[{ '_id' => em_obj_two._id, 'em_foo' => 'Em-Foo', 'em_bar' => 'Em-Bar' }], nil] }
         end
 
         context 'when relation not tracked' do
-          before(:each) do
-            ModelTwo.clear_trackable_memoization
+          before :each do
             ModelTwo.track_history on: :fields
           end
           it { expect(subject['em_twos']).to be_nil }
         end
 
         context 'when relation with permitted attributes for tracking' do
-          before(:each) do
-            ModelTwo.clear_trackable_memoization
+          before :each do
             ModelTwo.track_history on: { em_twos: :em_foo }
           end
           it { expect(subject['em_twos']).to eq [[{ '_id' => em_obj_two._id, 'em_foo' => 'Em-Foo' }], nil] }
         end
-
-        after(:all) do
-          Object.send(:remove_const, :ModelTwo)
-          Object.send(:remove_const, :EmTwo)
-        end
       end
 
       context 'when relation with alias' do
-        before(:all) do
+        before :each do
           class ModelTwo
             include Mongoid::Document
             include Mongoid::History::Trackable
+
             embeds_many :em_twos, store_as: :emws
             track_history on: :fields
+
+            track_history on: :em_twos
           end
 
           class EmTwo
             include Mongoid::Document
+
             field :em_foo
             embedded_in :model_two
           end
         end
 
-        before(:each) do
-          ModelTwo.clear_trackable_memoization
-          ModelTwo.track_history on: :em_twos
+        after :each do
+          Object.send(:remove_const, :ModelTwo)
+          Object.send(:remove_const, :EmTwo)
         end
 
         let(:obj_two) { ModelTwo.new(em_twos: [em_obj_two]) }
@@ -207,11 +222,6 @@ describe Mongoid::History::Attributes::Destroy do
         let(:base) { described_class.new(obj_two) }
 
         it { expect(subject['em_twos']).to eq [[{ '_id' => em_obj_two._id, 'em_foo' => 'Em-Foo' }], nil] }
-
-        after(:all) do
-          Object.send(:remove_const, :ModelTwo)
-          Object.send(:remove_const, :EmTwo)
-        end
       end
     end
   end

data/spec/unit/attributes/update_spec.rb

@@ -4,25 +4,33 @@ describe Mongoid::History::Attributes::Update do
   describe '#attributes' do
     describe '#insert_embeds_one_changes' do
       context 'Case: relation without alias' do
-        before(:all) do
+        before :each do
           class ModelOne
             include Mongoid::Document
             include Mongoid::History::Trackable
+
             store_in collection: :model_ones
             embeds_one :emb_one
+
             track_history on: :fields
           end
 
           class EmbOne
             include Mongoid::Document
+
             field :em_foo
             field :em_bar
+
             embedded_in :model_one
           end
         end
 
-        before(:each) do
-          ModelOne.clear_trackable_memoization
+        after :each do
+          Object.send(:remove_const, :ModelOne)
+          Object.send(:remove_const, :EmbOne)
+        end
+
+        before :each do
           allow(base).to receive(:changes) { changes }
         end
 
@@ -34,17 +42,23 @@ describe Mongoid::History::Attributes::Update do
         subject { base.attributes }
 
         context 'with permitted attributes' do
-          before(:each) { ModelOne.track_history on: { emb_one: :em_foo } }
+          before :each do
+            ModelOne.track_history on: { emb_one: :em_foo }
+          end
           it { expect(subject['emb_one']).to eq [{ 'em_foo' => 'Em-Foo' }, { 'em_foo' => 'Em-Foo-new' }] }
         end
 
         context 'without permitted attributes' do
-          before(:each) { ModelOne.track_history on: :emb_one }
+          before :each do
+            ModelOne.track_history on: :emb_one
+          end
           it { expect(subject['emb_one']).to eq [{ 'em_foo' => 'Em-Foo', 'em_bar' => 'Em-Bar' }, { 'em_foo' => 'Em-Foo-new', 'em_bar' => 'Em-Bar-new' }] }
         end
 
         context 'when old value soft-deleted' do
-          before(:each) { ModelOne.track_history on: :emb_one }
+          before :each do
+            ModelOne.track_history on: :emb_one
+          end
           let(:changes) do
             { 'emb_one' => [{ 'em_foo' => 'Em-Foo', 'deleted_at' => Time.now }, { 'em_foo' => 'Em-Foo-new', 'em_bar' => 'Em-Bar-new' }] }
           end
@@ -52,7 +66,9 @@ describe Mongoid::History::Attributes::Update do
         end
 
         context 'when new value soft-deleted' do
-          before(:each) { ModelOne.track_history on: :emb_one }
+          before :each do
+            ModelOne.track_history on: :emb_one
+          end
           let(:changes) do
             { 'emb_one' => [{ 'em_foo' => 'Em-Foo' }, { 'em_foo' => 'Em-Foo-new', 'deleted_at' => Time.now }] }
           end
@@ -60,21 +76,16 @@ describe Mongoid::History::Attributes::Update do
         end
 
         context 'when not tracked' do
-          before(:each) do
+          before :each do
             ModelOne.track_history on: :fields
             allow(ModelOne).to receive(:dynamic_enabled?) { false }
           end
           it { expect(subject['emb_one']).to be_nil }
         end
-
-        after(:all) do
-          Object.send(:remove_const, :ModelOne)
-          Object.send(:remove_const, :EmbOne)
-        end
       end
 
       context 'Case: relation with alias' do
-        before(:all) do
+        before :each do
           class ModelOne
             include Mongoid::Document
             include Mongoid::History::Trackable
@@ -91,8 +102,12 @@ describe Mongoid::History::Attributes::Update do
           end
         end
 
-        before(:each) do
-          ModelOne.clear_trackable_memoization
+        after :each do
+          Object.send(:remove_const, :ModelOne)
+          Object.send(:remove_const, :EmbOne)
+        end
+
+        before :each do
           ModelOne.track_history on: :emb_one
           allow(base).to receive(:changes) { changes }
         end
@@ -104,15 +119,10 @@ describe Mongoid::History::Attributes::Update do
         end
         subject { base.attributes }
         it { expect(subject['eon']).to eq [{ 'em_foo' => 'Em-Foo' }, { 'em_foo' => 'Em-Foo-new', 'em_bar' => 'Em-Bar-new' }] }
-
-        after(:all) do
-          Object.send(:remove_const, :ModelOne)
-          Object.send(:remove_const, :EmbOne)
-        end
       end
 
       context 'when original and modified value same' do
-        before(:all) do
+        before :each do
           class DummyUpdateModel
             include Mongoid::Document
             include Mongoid::History::Trackable
@@ -129,8 +139,12 @@ describe Mongoid::History::Attributes::Update do
           end
         end
 
-        before(:each) do
-          DummyUpdateModel.clear_trackable_memoization
+        after :each do
+          Object.send(:remove_const, :DummyUpdateModel)
+          Object.send(:remove_const, :DummyEmbeddedModel)
+        end
+
+        before :each do
           allow(base).to receive(:changes) { changes }
           DummyUpdateModel.track_history on: :dummy_embedded_model
         end
@@ -142,22 +156,21 @@ describe Mongoid::History::Attributes::Update do
         end
         subject { base.attributes }
         it { expect(subject.keys).to_not include 'dummy_embedded_model' }
-
-        after(:all) do
-          Object.send(:remove_const, :DummyUpdateModel)
-          Object.send(:remove_const, :DummyEmbeddedModel)
-        end
       end
     end
 
     describe '#insert_embeds_many_changes' do
       context 'Case: relation without alias' do
-        before(:all) do
+        before :each do
           class ModelOne
             include Mongoid::Document
             include Mongoid::History::Trackable
             store_in collection: :model_ones
-            embeds_many :emb_ones
+            if Mongoid::Compatibility::Version.mongoid7_or_newer?
+              embeds_many :emb_ones
+            else
+              embeds_many :emb_ones, inverse_class_name: 'EmbOne'
+            end
             track_history on: :fields
           end
 
@@ -169,8 +182,7 @@ describe Mongoid::History::Attributes::Update do
           end
         end
 
-        before(:each) do
-          ModelOne.clear_trackable_memoization
+        before :each do
           allow(base).to receive(:changes) { changes }
         end
 
@@ -179,7 +191,9 @@ describe Mongoid::History::Attributes::Update do
         subject { base.attributes }
 
         context 'with whitelist attributes' do
-          before(:each) { ModelOne.track_history on: { emb_ones: :em_foo } }
+          before :each do
+            ModelOne.track_history on: { emb_ones: :em_foo }
+          end
           let(:changes) do
             { 'emb_ones' => [[{ 'em_foo' => 'Em-Foo', 'em_bar' => 'Em-Bar' }], [{ 'em_foo' => 'Em-Foo-new', 'em_bar' => 'Em-Bar-new' }]] }
           end
@@ -189,7 +203,9 @@ describe Mongoid::History::Attributes::Update do
         end
 
         context 'without whitelist attributes' do
-          before(:each) { ModelOne.track_history on: :emb_ones }
+          before :each do
+            ModelOne.track_history(on: :emb_ones)
+          end
           let(:changes) do
             { 'emb_ones' => [[{ 'em_foo' => 'Em-Foo', 'deleted_at' => Time.now }], [{ 'em_foo' => 'Em-Foo-new', 'em_bar' => 'Em-Bar-new' }]] }
           end
@@ -198,19 +214,23 @@ describe Mongoid::History::Attributes::Update do
           end
         end
 
-        after(:all) do
+        after :each do
           Object.send(:remove_const, :ModelOne)
           Object.send(:remove_const, :EmbOne)
         end
       end
 
       context 'Case: relation with alias' do
-        before(:all) do
+        before :each do
           class ModelOne
             include Mongoid::Document
             include Mongoid::History::Trackable
             store_in collection: :model_ones
-            embeds_many :emb_ones, store_as: :eons
+            if Mongoid::Compatibility::Version.mongoid7_or_newer?
+              embeds_many :emb_ones, store_as: :eons
+            else
+              embeds_many :emb_ones, store_as: :eons, inverse_class_name: 'EmbOne'
+            end
             track_history on: :fields
           end
 
@@ -222,8 +242,7 @@ describe Mongoid::History::Attributes::Update do
           end
         end
 
-        before(:each) do
-          ModelOne.clear_trackable_memoization
+        before :each do
           ModelOne.track_history on: :emb_ones
           allow(base).to receive(:changes) { changes }
         end
@@ -238,19 +257,23 @@ describe Mongoid::History::Attributes::Update do
           expect(subject['eons']).to eq [[{ 'em_foo' => 'Em-Foo' }], [{ 'em_foo' => 'Em-Foo-new', 'em_bar' => 'Em-Bar-new' }]]
         end
 
-        after(:all) do
+        after :each do
           Object.send(:remove_const, :ModelOne)
           Object.send(:remove_const, :EmbOne)
         end
       end
 
       context 'when original and modified value same' do
-        before(:all) do
+        before :each do
           class ModelOne
             include Mongoid::Document
             include Mongoid::History::Trackable
             store_in collection: :model_ones
-            embeds_many :emb_ones
+            if Mongoid::Compatibility::Version.mongoid7_or_newer?
+              embeds_many :emb_ones
+            else
+              embeds_many :emb_ones, inverse_class_name: 'EmbOne'
+            end
             track_history on: :fields
           end
 
@@ -262,8 +285,7 @@ describe Mongoid::History::Attributes::Update do
           end
         end
 
-        before(:each) do
-          ModelOne.clear_trackable_memoization
+        before :each do
           allow(base).to receive(:changes) { changes }
           ModelOne.track_history on: :emb_ones
         end
@@ -276,7 +298,7 @@ describe Mongoid::History::Attributes::Update do
         subject { base.attributes }
         it { expect(subject.keys).to_not include 'emb_ones' }
 
-        after(:all) do
+        after :each do
           Object.send(:remove_const, :ModelOne)
           Object.send(:remove_const, :EmbOne)
         end
@@ -284,7 +306,7 @@ describe Mongoid::History::Attributes::Update do
     end
 
     context 'when original and modified values blank' do
-      before(:all) do
+      before :each do
         class DummyParent
           include Mongoid::Document
           include Mongoid::History::Trackable
@@ -299,8 +321,7 @@ describe Mongoid::History::Attributes::Update do
         end
       end
 
-      before(:each) do
-        DummyParent.clear_trackable_memoization
+      before :each do
         allow(base).to receive(:changes) { changes }
         DummyParent.track_history on: :other_dummy_parent_ids
       end
@@ -312,7 +333,7 @@ describe Mongoid::History::Attributes::Update do
       subject { base.attributes }
       it { expect(subject.keys).to_not include 'other_dummy_parent_ids' }
 
-      after(:all) do
+      after :each do
         Object.send(:remove_const, :DummyParent)
         Object.send(:remove_const, :OtherDummyParent)
       end