mongoid-history 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e9cb97f94a3cb084d92c85412f2e4cf2cc67895
-  data.tar.gz: c61a511effb8ee2ebb559aad5a77c3ec800eff78
+SHA256:
+  metadata.gz: 84ee622b782d764b3a15ea31bfac94cbedf3fa023d8ae0302022562d6a5a6ec2
+  data.tar.gz: abf09c6ed9db7126b9d7754f42a0f1b00317919ad6744f0486b4d970601eb3f4
 SHA512:
-  metadata.gz: 0a6079af9f6834d5c65d38106fca027a243871087fd0669e1120b4b2c074dde16ddd5d992e01208c73cd4cd7959c0ef6d03e49af4de4b4fc8783a7445d9fac41
-  data.tar.gz: 3dd2f512a2591d3e2123ae2fcbacd615d70be5983b9d955e393bf0f54463a18cb08fec3afb8259cabe87163e4d1baa384f7225e91d181492ce01954f92c022ad
+  metadata.gz: 484eb94fae5bba8b787ffda61403e65c95684f9e3a77c03daa56952e056c440d639d58d3a381760e7996ec1bec1415fe409f6688fab38ed24d6e0315f53c9369
+  data.tar.gz: f66b6abc4dcf17696bafea67faddbcd0b97f194e8b8b36c48f32461a31987b9867a6dbf204a8604a391654ebace4c94c76b4b745ac2511b74db8df26f886d54a

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-20 23:31:54 -0400 using RuboCop version 0.48.1.
+# on 2019-06-09 13:41:12 +0200 using RuboCop version 0.60.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,16 +8,16 @@
 
 # Offense count: 7
 # Configuration parameters: Include.
-# Include: **/Gemfile, **/gems.rb
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/DuplicatedGem:
   Exclude:
     - 'Gemfile'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
+# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
 # SupportedStylesAlignWith: keyword, variable, start_of_line
-Lint/EndAlignment:
+Layout/EndAlignment:
   Exclude:
     - 'lib/mongoid/history/options.rb'
 
@@ -32,44 +32,47 @@ Lint/ParenthesesAsGroupedExpression:
     - 'spec/integration/integration_spec.rb'
     - 'spec/integration/nested_embedded_polymorphic_documents_spec.rb'
 
-# Offense count: 21
+# Offense count: 22
 Metrics/AbcSize:
   Max: 52
 
-# Offense count: 117
+# Offense count: 122
 # Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 820
+  Max: 837
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 114
+  Max: 125
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 392
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 688
-
-# Offense count: 15
-# Configuration parameters: CountComments.
+# Offense count: 17
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 23
 
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 182
+  Max: 191
 
 # Offense count: 6
 Metrics/PerceivedComplexity:
   Max: 15
 
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'Dangerfile'
+    - 'lib/mongoid-history.rb'
+
 # Offense count: 12
 Style/Documentation:
   Exclude:
@@ -91,15 +94,13 @@ Style/EachWithObject:
     - 'lib/mongoid/history/trackable.rb'
     - 'lib/mongoid/history/tracker.rb'
 
-# Offense count: 2
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Style/FileName:
-  Exclude:
-    - 'Dangerfile'
-    - 'lib/mongoid-history.rb'
-
 # Offense count: 1
 Style/MultilineBlockChain:
   Exclude:
     - 'lib/mongoid/history/tracker.rb'
+
+# Offense count: 404
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 688

data/.travis.yml

@@ -16,7 +16,7 @@ env:
   - MONGOID_VERSION=HEAD
 
 rvm:
-  - 2.3.1
+  - 2.3
 
 before_install:
   - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.8.2 (2019/12/02)
+
+* [#233](https://github.com/mongoid/mongoid-history/pull/233): Bug fix-Track ALL embedded relations when used with fields and filtered attributes on embedded objects - [@jagdeepsingh](https://github.com/jagdeepsingh).
+* [#232](https://github.com/mongoid/mongoid-history/pull/232): Bug/187 track changes from embedded documents (not deeply nested) - [@Startouf](https://github.com/Startouf).
+* [#227](https://github.com/mongoid/mongoid-history/pull/227): Store options in inheritable class attributes - [@jnfeinstein](https://github.com/jnfeinstein).
+* [#229](https://github.com/mongoid/mongoid-history/pull/229), [#225](https://github.com/mongoid/mongoid-history/pull/225): Fixed inheritance of `history_trackable_options` - [@jnfeinstein](https://github.com/jnfeinstein).
+
 ### 0.8.1 (2018/06/28)
 
 * [#221](https://github.com/mongoid/mongoid-history/pull/221): Mongoid 7 support - [@dblock](https://github.com/dblock).

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2016 Aaron Qian & Contributors
+Copyright (c) 2011-2018 Aaron Qian & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -580,6 +580,6 @@ You're encouraged to contribute to this library. See [CONTRIBUTING](CONTRIBUTING
 Copyright
 ---------
 
-Copyright (c) 2011-2016 Aaron Qian and Contributors.
+Copyright (c) 2011-2018 Aaron Qian and Contributors.
 
 MIT License. See [LICENSE.txt](LICENSE.txt) for further details.

data/lib/mongoid/history.rb

@@ -15,7 +15,6 @@ module Mongoid
 
     class << self
       attr_accessor :tracker_class_name
-      attr_accessor :trackable_class_options
       attr_accessor :trackable_settings
       attr_accessor :modifier_class_name
       attr_accessor :current_user_method
@@ -45,9 +44,19 @@ module Mongoid
 
       def reset!
         Mongoid::History.modifier_class_name = 'User'
-        Mongoid::History.trackable_class_options = {}
         Mongoid::History.trackable_settings = {}
         Mongoid::History.current_user_method ||= :current_user
+
+        Mongoid.models.each do |model|
+          next unless model.included_modules.include? Mongoid::History::Trackable
+
+          model.singleton_class.class_eval do
+            # Inverse of class_attribute
+            %i[mongoid_history_options
+               mongoid_history_options=
+               mongoid_history_options?].each { |m| remove_possible_method(m) }
+          end
+        end
       end
     end
   end

data/lib/mongoid/history/attributes/update.rb

@@ -2,33 +2,91 @@ module Mongoid
   module History
     module Attributes
       class Update < ::Mongoid::History::Attributes::Base
+        # @example when both an attribute `foo` and a child's attribute `nested_bar.baz` are changed
+        #
+        #   {
+        #     'foo' => ['foo_before_changes', 'foo_after_changes']
+        #     'nested_bar.baz' => ['nested_bar_baz_before_changes', 'nested_bar_baz_after_changes']
+        #     }
+        #   }
+        #
+        # @return [Hash<String, Array<(?,?)>>] Hash of changes
         def attributes
-          @attributes = {}
+          changes_from_parent.deep_merge(changes_from_children)
+        end
+
+        private
+
+        def changes_from_parent
+          parent_changes = {}
           changes.each do |k, v|
-            if trackable_class.tracked_embeds_one?(k)
-              insert_embeds_one_changes(k, v)
-            elsif trackable_class.tracked_embeds_many?(k)
-              insert_embeds_many_changes(k, v)
-            elsif trackable_class.tracked?(k, :update)
-              @attributes[k] = format_field(k, v) unless v.all?(&:blank?)
+            change_value = begin
+              if trackable_class.tracked_embeds_one?(k)
+                embeds_one_changes_from_parent(k, v)
+              elsif trackable_class.tracked_embeds_many?(k)
+                embeds_many_changes_from_parent(k, v)
+              elsif trackable_class.tracked?(k, :update)
+                { k => format_field(k, v) } unless v.all?(&:blank?)
+              end
             end
+            parent_changes.merge!(change_value) if change_value.present?
           end
-          @attributes
+          parent_changes
         end
 
-        private
+        def changes_from_children
+          embeds_one_changes_from_embedded_documents
+        end
+
+        # Retrieve the list of changes applied directly to the nested documents
+        #
+        # @example when a child's name is changed from "todd" to "mario"
+        #
+        #   child = Child.new(name: 'todd')
+        #   Parent.create(child: child)
+        #   child.name = "Mario"
+        #
+        #   embeds_one_changes_from_embedded_documents # when called from "Parent"
+        #   # => { "child.name"=>["todd", "mario"] }
+        #
+        # @return [Hash<String, Array<(?,?)>] changes of embeds_ones from embedded documents
+        def embeds_one_changes_from_embedded_documents
+          embedded_doc_changes = {}
+          trackable_class.tracked_embeds_one.each do |rel|
+            rel_class = trackable_class.relation_class_of(rel)
+            paranoia_field = Mongoid::History.trackable_class_settings(rel_class)[:paranoia_field]
+            paranoia_field = rel_class.aliased_fields.key(paranoia_field) || paranoia_field
+            rel = aliased_fields.key(rel) || rel
+            obj = trackable.send(rel)
+            next if !obj || (obj.respond_to?(paranoia_field) && obj.public_send(paranoia_field).present?)
 
-        def insert_embeds_one_changes(relation, value)
+            obj.changes.each do |k, v|
+              embedded_doc_changes["#{rel}.#{k}"] = [v.first, v.last]
+            end
+          end
+          embedded_doc_changes
+        end
+
+        # @param [String] relation
+        # @param [String] value
+        #
+        # @return [Hash<String, Array<(?,?)>>]
+        def embeds_one_changes_from_parent(relation, value)
           relation = trackable_class.database_field_name(relation)
           relation_class = trackable_class.relation_class_of(relation)
           paranoia_field = Mongoid::History.trackable_class_settings(relation_class)[:paranoia_field]
           original_value = value[0][paranoia_field].present? ? {} : format_embeds_one_relation(relation, value[0])
           modified_value = value[1][paranoia_field].present? ? {} : format_embeds_one_relation(relation, value[1])
           return if original_value == modified_value
-          @attributes[relation] = [original_value, modified_value]
+
+          { relation => [original_value, modified_value] }
         end
 
-        def insert_embeds_many_changes(relation, value)
+        # @param [String] relation
+        # @param [String] value
+        #
+        # @return [Hash<Array<(?,?)>>]
+        def embeds_many_changes_from_parent(relation, value)
           relation = trackable_class.database_field_name(relation)
           relation_class = trackable_class.relation_class_of(relation)
           paranoia_field = Mongoid::History.trackable_class_settings(relation_class)[:paranoia_field]
@@ -37,7 +95,8 @@ module Mongoid
           modified_value = value[1].reject { |rel| rel[paranoia_field].present? }
                                    .map { |v_attrs| format_embeds_many_relation(relation, v_attrs) }
           return if original_value == modified_value
-          @attributes[relation] = [original_value, modified_value]
+
+          { relation => [original_value, modified_value] }
         end
       end
     end

data/lib/mongoid/history/options.rb

@@ -95,12 +95,20 @@ module Mongoid
         @options[:relations] = { embeds_one: {}, embeds_many: {} }
 
         options[:on].each do |option|
-          field = get_database_field_name(option)
-          field_options = get_field_options(option)
-          categorize_tracked_option(field, field_options)
+          if option.is_a?(Hash)
+            option.each { |k, v| split_and_categorize(k => v) }
+          else
+            split_and_categorize(option)
+          end
         end
       end
 
+      def split_and_categorize(field_and_options)
+        field = get_database_field_name(field_and_options)
+        field_options = get_field_options(field_and_options)
+        categorize_tracked_option(field, field_options)
+      end
+
       # Returns the database_field_name key for tracked option
       #
       # @param [ String | Symbol | Array | Hash ] option The field or relation name to track

data/lib/mongoid/history/trackable.rb

@@ -29,8 +29,11 @@ module Mongoid
           around_create :track_create, callback_options if history_options.options[:track_create]
           around_destroy :track_destroy, callback_options if history_options.options[:track_destroy]
 
-          Mongoid::History.trackable_class_options ||= {}
-          Mongoid::History.trackable_class_options[history_options.scope] = history_options
+          unless respond_to? :mongoid_history_options
+            class_attribute :mongoid_history_options, instance_accessor: false
+          end
+
+          self.mongoid_history_options = history_options
         end
 
         def history_settings(options = {})
@@ -260,18 +263,43 @@ module Mongoid
           @history_tracks = nil
         end
 
+        # Transform hash of pair of changes into an `original` and `modified` hash
+        # Nested document keys (key name with dots) are expanded
+        #
+        # @param [Hash<Array>] changes
+        #
+        # @return [Array<Hash<?>,Hash<?>>] <description>
         def transform_changes(changes)
           original = {}
           modified = {}
-          changes.each_pair do |k, v|
-            o, m = v
-            original[k] = o unless o.nil?
-            modified[k] = m unless m.nil?
+          changes.each_pair do |k, modification_pair|
+            o, m = modification_pair
+            original.deep_merge!(expand_nested_document_key_value(k, o)) unless o.nil?
+            modified.deep_merge!(expand_nested_document_key_value(k, m)) unless m.nil?
           end
 
           [original, modified]
         end
 
+        # Handle nested document tracking of changes
+        #
+        # @example
+        #
+        #   expand_nested_document_key('embedded.document.changed_field', 'old'])
+        #   #=> { 'embedded' => {'document' => { 'changed_field' => 'old' }}}
+        #
+        # @param [String] document_key key with dots
+        # @param [?] value
+        #
+        # @return [Hash<String, ?>]
+        def expand_nested_document_key_value(document_key, value)
+          expanded_key = value
+          document_key.to_s.split('.').reverse.each do |key|
+            expanded_key = { key => expanded_key }
+          end
+          expanded_key
+        end
+
         def increment_current_version
           current_version = (send(history_trackable_options[:version_field]) || 0) + 1
           send("#{history_trackable_options[:version_field]}=", current_version)
@@ -287,7 +315,10 @@ module Mongoid
         def track_history_for_action(action)
           if track_history_for_action?(action)
             current_version = increment_current_version
-            last_track = self.class.tracker_class.create!(history_tracker_attributes(action.to_sym).merge(version: current_version, action: action.to_s, trackable: self))
+            last_track = self.class.tracker_class.create!(
+              history_tracker_attributes(action.to_sym)
+              .merge(version: current_version, action: action.to_s, trackable: self)
+            )
           end
 
           clear_trackable_memoization
@@ -518,7 +549,7 @@ module Mongoid
         end
 
         def history_trackable_options
-          @history_trackable_options ||= Mongoid::History.trackable_class_options[trackable_scope].prepared
+          @history_trackable_options ||= mongoid_history_options.prepared
         end
 
         def clear_trackable_memoization

data/lib/mongoid/history/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module History
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.8.2'.freeze
   end
 end

data/spec/integration/integration_spec.rb

@@ -950,5 +950,27 @@ describe Mongoid::History do
         expect(sausage.reload.flavour).to eq('Guinness')
       end
     end
+
+    describe 'changing collection' do
+      before :each do
+        class Fish
+          include Mongoid::Document
+          include Mongoid::History::Trackable
+
+          track_history on: [:species], modifier_field_optional: true
+          store_in collection: :animals
+
+          field :species
+        end
+      end
+
+      after :each do
+        Object.send(:remove_const, :Fish)
+      end
+
+      it 'should track history' do
+        Fish.new.save!
+      end
+    end
   end
 end

data/spec/integration/nested_embedded_documents_tracked_in_parent_spec.rb

@@ -0,0 +1,124 @@
+require 'spec_helper'
+
+describe Mongoid::History::Tracker do
+  describe 'Tracking of changes from embedded documents' do
+    before :each do
+      # Child model (will be embedded in Parent)
+      class Child
+        include Mongoid::Document
+        include Mongoid::History::Trackable
+
+        field :name
+        embedded_in :parent, inverse_of: :child
+        embeds_one :child, inverse_of: :parent, class_name: 'NestedChild'
+      end
+
+      # NestedChild model (will be embedded in Child)
+      class NestedChild
+        include Mongoid::Document
+        include Mongoid::History::Trackable
+
+        field :name
+        embedded_in :parent, inverse_of: :child, class_name: 'Child'
+      end
+
+      # Parent model (embeds one Child)
+      class Parent
+        include Mongoid::Document
+        include Mongoid::History::Trackable
+
+        field :name, type: String
+        embeds_one :child
+
+        store_in collection: :parent
+
+        track_history(
+          on: %i[fields embedded_relations],
+          version_field: :version,
+          track_create: true,
+          track_update: true,
+          track_destroy: false,
+          modifier_field: nil
+        )
+      end
+    end
+
+    after :each do
+      Object.send(:remove_const, :Parent)
+      Object.send(:remove_const, :Child)
+      Object.send(:remove_const, :NestedChild)
+    end
+
+    context 'with a parent-child hierarchy' do
+      let(:parent) do
+        Parent.create!(name: 'bowser', child: Child.new(name: 'todd'))
+      end
+
+      it 'tracks history for the nested embedded documents in the parent' do
+        expect(parent.history_tracks.length).to eq(1)
+
+        aggregate_failures do
+          track = parent.history_tracks.last
+          expect(track.modified['name']).to eq('bowser')
+          expect(track.modified.dig('child', 'name')).to eq('todd')
+        end
+
+        parent.update_attributes(name: 'brow')
+        expect(parent.history_tracks.length).to eq(2)
+
+        parent.child.name = 'mario'
+        parent.save!
+        expect(parent.history_tracks.length).to eq(3)
+
+        aggregate_failures do
+          track = parent.history_tracks.last
+          expect(track.original.dig('child', 'name')).to eq('todd')
+          expect(track.modified.dig('child', 'name')).to eq('mario')
+        end
+      end
+    end
+
+    context 'with a deeply nested hierarchy' do
+      let(:parent) do
+        Parent.create!(
+          name: 'bowser',
+          child: Child.new(
+            name: 'todd',
+            child: NestedChild.new(name: 'peach')
+          )
+        )
+      end
+
+      it 'tracks history for deeply nested embedded documents in parent' do
+        pending('Figure out a way to track deeply nested relation changes')
+
+        expect(parent.history_tracks.length).to eq(1)
+
+        aggregate_failures do
+          track = parent.history_tracks.last
+          expect(track.modified['name']).to eq('bowser')
+          expect(track.modified.dig('child', 'name')).to eq('todd')
+          expect(track.modified.dig('child', 'child', 'name')).to eq('peach')
+        end
+
+        parent.name = 'brow'
+        parent.child.name = 'mario'
+        parent.child.child.name = 'luigi'
+        parent.save!
+        expect(parent.history_tracks.length).to eq(2)
+
+        aggregate_failures do
+          track = parent.history_tracks.last
+          expect(track.original['name']).to eq('bowser')
+          expect(track.modified['name']).to eq('brow')
+
+          expect(track.original['child']['name']).to eq('todd')
+          expect(track.modified['child']['name']).to eq('mario')
+
+          expect(track.original['child']['child']['name']).to eq('peach')
+          expect(track.modified['child']['child']['name']).to eq('luigi')
+        end
+      end
+    end
+  end
+end

data/spec/support/mongoid_history.rb

@@ -8,6 +8,5 @@ RSpec.configure do |config|
   end
   config.after :each do
     Mongoid::History.tracker_class_name = nil
-    Mongoid::History.trackable_class_options = nil
   end
 end

data/spec/unit/history_spec.rb

@@ -34,4 +34,25 @@ describe Mongoid::History do
       it { expect(described_class.trackable_class_settings(ModelOne)).to eq(paranoia_field: 'deleted_at') }
     end
   end
+
+  describe '#reset!' do
+    before :each do
+      class ModelTwo
+        include Mongoid::Document
+        include Mongoid::History::Trackable
+
+        track_history
+      end
+    end
+
+    after :each do
+      Object.send(:remove_const, :ModelTwo)
+    end
+
+    it 'should remove all configurations' do
+      expect(ModelTwo).to have_attributes mongoid_history_options: be_a(Mongoid::History::Options)
+      Mongoid::History.reset!
+      expect(ModelTwo).to_not respond_to :mongoid_history_options
+    end
+  end
 end

data/spec/unit/options_spec.rb

@@ -275,6 +275,15 @@ describe Mongoid::History::Options do
               it { expect(subject[:relations][:embeds_many]).to eq('emb_threes' => %w[_id fmb]) }
             end
 
+            context 'with fields, and multiple embeds_one, and embeds_many relations' do
+              let(:options) { { on: [:foo, :bar, :emb_two, { emb_threes: %i[f_em_foo f_em_bar], emb_fours: :f_em_baz }] } }
+              it 'should categorize fields and associations correctly' do
+                expect(subject[:fields]).to eq(%w[foo b])
+                expect(subject[:relations][:embeds_one]).to eq('emtw' => %w[_id f_em_baz])
+                expect(subject[:relations][:embeds_many]).to eq('emb_threes' => %w[_id f_em_foo fmb], 'emfs' => %w[_id f_em_baz])
+              end
+            end
+
             context 'with field alias' do
               let(:options) { { on: :bar } }
               it { expect(subject[:fields]).to eq %w[b] }

data/spec/unit/trackable_spec.rb

@@ -37,12 +37,6 @@ describe Mongoid::History::Trackable do
     expect(MyModel).to respond_to :track_history
   end
 
-  it 'should append trackable_class_options ONLY when #track_history is called' do
-    expect(Mongoid::History.trackable_class_options).to be_blank
-    MyModel.track_history
-    expect(Mongoid::History.trackable_class_options.keys).to eq([:my_model])
-  end
-
   describe '#track_history' do
     before :each do
       class MyModelWithNoModifier
@@ -85,7 +79,7 @@ describe Mongoid::History::Trackable do
     let(:reserved_fields) { %w[_id version modifier_id] }
 
     it 'should have default options' do
-      expect(Mongoid::History.trackable_class_options[:my_model].prepared).to eq(expected_option)
+      expect(MyModel.mongoid_history_options.prepared).to eq(expected_option)
     end
 
     it 'should define callback function #track_update' do
@@ -266,7 +260,7 @@ describe Mongoid::History::Trackable do
       end
 
       it 'should have default options' do
-        expect(Mongoid::History.trackable_class_options[:my_model].prepared).to eq(expected_option)
+        expect(MyModel.mongoid_history_options.prepared).to eq(expected_option)
       end
 
       it 'should define #history_trackable_options' do
@@ -784,4 +778,62 @@ describe Mongoid::History::Trackable do
       end.to change(Tracker, :count).by(0)
     end
   end
+
+  context 'changing collection' do
+    before :each do
+      class Fish
+        include Mongoid::Document
+        include Mongoid::History::Trackable
+
+        track_history on: [:species], modifier_field_optional: true
+        store_in collection: :animals
+
+        field :species
+      end
+    end
+
+    after :each do
+      Object.send(:remove_const, :Fish)
+    end
+
+    it 'should track history' do
+      expect do
+        expect { Fish.new.save! }.to_not raise_error
+      end.to change(Tracker, :count).by(1)
+    end
+  end
+
+  context "extending a #{described_class}" do
+    before :each do
+      MyModel.track_history
+
+      class CustomTracker < MyModel
+        field :key
+
+        track_history on: :key, changes_method: :my_changes, track_create: true
+
+        def my_changes
+          changes.merge('key' => "Save history-#{key}")
+        end
+      end
+
+      MyModel.history_trackable_options
+    end
+
+    after :each do
+      Object.send(:remove_const, :CustomTracker)
+    end
+
+    it 'should not override in parent class' do
+      expect(MyModel.history_trackable_options[:changes_method]).to eq :changes
+      expect(CustomTracker.history_trackable_options[:changes_method]).to eq :my_changes
+    end
+
+    it 'should default to :changes' do
+      m = MyModel.create!(modifier: user)
+      expect(m).to receive(:changes).exactly(3).times.and_call_original
+      expect(m).not_to receive(:my_changes)
+      m.save!
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-history
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Aaron Qian
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_diff
@@ -117,6 +117,7 @@ files:
 - spec/integration/multi_relation_spec.rb
 - spec/integration/multiple_trackers_spec.rb
 - spec/integration/nested_embedded_documents_spec.rb
+- spec/integration/nested_embedded_documents_tracked_in_parent_spec.rb
 - spec/integration/nested_embedded_polymorphic_documents_spec.rb
 - spec/integration/subclasses_spec.rb
 - spec/integration/track_history_order_spec.rb
@@ -157,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Track and audit, undo and redo changes on Mongoid documents.
@@ -168,6 +168,7 @@ test_files:
 - spec/integration/multi_relation_spec.rb
 - spec/integration/multiple_trackers_spec.rb
 - spec/integration/nested_embedded_documents_spec.rb
+- spec/integration/nested_embedded_documents_tracked_in_parent_spec.rb
 - spec/integration/nested_embedded_polymorphic_documents_spec.rb
 - spec/integration/subclasses_spec.rb
 - spec/integration/track_history_order_spec.rb