mongoid-history 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ee622b782d764b3a15ea31bfac94cbedf3fa023d8ae0302022562d6a5a6ec2
-  data.tar.gz: abf09c6ed9db7126b9d7754f42a0f1b00317919ad6744f0486b4d970601eb3f4
+  metadata.gz: 7f7558f1c6033e5350cdeb3732e385d483c7abfa71ffc7f89acfbba22befff97
+  data.tar.gz: 71c5f5ab67e1bd040e14b040211b1acc5532449f048919c83adcb4e875f7eac4
 SHA512:
-  metadata.gz: 484eb94fae5bba8b787ffda61403e65c95684f9e3a77c03daa56952e056c440d639d58d3a381760e7996ec1bec1415fe409f6688fab38ed24d6e0315f53c9369
-  data.tar.gz: f66b6abc4dcf17696bafea67faddbcd0b97f194e8b8b36c48f32461a31987b9867a6dbf204a8604a391654ebace4c94c76b4b745ac2511b74db8df26f886d54a
+  metadata.gz: f528411205ca81444296803927b54c1bd1ef570611b2b4a9bb79f6e4165fb038c5b13ad5fb79c8adde96c62eaefa1142bf5f4c6b5f44d72a80743f38a0aa5d48
+  data.tar.gz: 4149122d3f6c474f5f0105772fa64a9fe237d299005e97ad021e887f42687d1a81ede778c589070231319704b9c71e2f99a5e660d04c2581a078178e965b0425

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-06-09 13:41:12 +0200 using RuboCop version 0.60.0.
+# on 2020-04-10 17:25:32 -0500 using RuboCop version 0.48.1.
 # 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,19 +8,11 @@
 
 # Offense count: 7
 # Configuration parameters: Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+# Include: **/Gemfile, **/gems.rb
 Bundler/DuplicatedGem:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
-  Exclude:
-    - 'lib/mongoid/history/options.rb'
-
 # Offense count: 3
 Lint/HandleExceptions:
   Exclude:
@@ -38,21 +30,26 @@ Metrics/AbcSize:
 
 # Offense count: 122
 # Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
 Metrics/BlockLength:
   Max: 837
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 125
+  Max: 120
 
 # Offense count: 6
 Metrics/CyclomaticComplexity:
   Max: 13
 
+# Offense count: 412
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 688
+
 # Offense count: 17
-# Configuration parameters: CountComments, ExcludedMethods.
+# Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 23
 
@@ -65,15 +62,7 @@ Metrics/ModuleLength:
 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
+# Offense count: 15
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -86,6 +75,8 @@ Style/Documentation:
     - 'lib/mongoid/history/options.rb'
     - 'lib/mongoid/history/trackable.rb'
     - 'lib/mongoid/history/tracker.rb'
+    - 'perf/benchmark_modified_attributes_for_create.rb'
+    - 'perf/gc_suite.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -94,13 +85,15 @@ 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/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.8.3 (2020/05/17)
+
+* [#236](https://github.com/mongoid/mongoid-history/pull/236): Fix Ruby 2.7 keyword argument warnings - [@vasilysn](https://github.com/vasilysn).
+* [#237](https://github.com/mongoid/mongoid-history/pull/237): Fix tracking subclasses with additional fields - [@getaroom](https://github.com/getaroom).
+* [#239](https://github.com/mongoid/mongoid-history/pull/239): Optimize `modified_attributes_for_create` 6-7x - [@getaroom](https://github.com/getaroom).
+* [#240](https://github.com/mongoid/mongoid-history/pull/240): `Mongoid::History.disable` and `disable_tracking` now restore the original state - [@getaroom](https://github.com/getaroom).
+* [#240](https://github.com/mongoid/mongoid-history/pull/240): Added `Mongoid::History.enable`, `Mongoid::History.enable!`, `Mongoid::History.disable!`, `enable_tracking`, `enable_tracking!`, and `disable_tracking!` - [@getaroom](https://github.com/getaroom).
+
 ### 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).

data/Gemfile

@@ -29,6 +29,7 @@ group :development, :test do
 end
 
 group :test do
+  gem 'benchmark-ips', require: false
   gem 'coveralls'
   gem 'gem-release'
   gem 'mongoid-danger', '~> 0.1.0', require: false

data/README.md

@@ -149,11 +149,34 @@ Comment.disable_tracking do
   comment.update_attributes(:title => "Test 3")
 end
 
-# globally disable all history tracking
+# disable tracking for comments by default
+Comment.disable_tracking!
+
+# enable tracking for comments within a block
+Comment.enable_tracking do
+  comment.update_attributes(:title => "Test 3")
+end
+
+# renable tracking for comments by default
+Comment.enable_tracking!
+
+# globally disable all history tracking within a block
 Mongoid::History.disable do
   comment.update_attributes(:title => "Test 3")
   user.update_attributes(:name => "Eddie Van Halen")
 end
+
+# globally disable all history tracking by default
+Mongoid::History.disable!
+
+# globally enable all history tracking within a block
+Mongoid::History.enable do
+  comment.update_attributes(:title => "Test 3")
+  user.update_attributes(:name => "Eddie Van Halen")
+end
+
+# globally renable all history tracking by default
+Mongoid::History.enable!
 ```
 
 You may want to track changes on all fields.
@@ -516,7 +539,7 @@ For more examples, check out [spec/integration/integration_spec.rb](spec/integra
 
 You can have different trackers for different classes like so.
 
-```
+``` ruby
 class First
   include Mongoid::Document
   include Mongoid::History::Trackable

data/lib/mongoid/history.rb

@@ -19,13 +19,25 @@ module Mongoid
       attr_accessor :modifier_class_name
       attr_accessor :current_user_method
 
-      def disable(&_block)
+      def disable
+        original_flag = store[GLOBAL_TRACK_HISTORY_FLAG]
         store[GLOBAL_TRACK_HISTORY_FLAG] = false
-        yield
+        yield if block_given?
       ensure
+        store[GLOBAL_TRACK_HISTORY_FLAG] = original_flag if block_given?
+      end
+
+      def enable
+        original_flag = store[GLOBAL_TRACK_HISTORY_FLAG]
         store[GLOBAL_TRACK_HISTORY_FLAG] = true
+        yield if block_given?
+      ensure
+        store[GLOBAL_TRACK_HISTORY_FLAG] = original_flag if block_given?
       end
 
+      alias disable! disable
+      alias enable! enable
+
       def enabled?
         store[GLOBAL_TRACK_HISTORY_FLAG] != false
       end

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

@@ -4,14 +4,9 @@ module Mongoid
       class Create < ::Mongoid::History::Attributes::Base
         def attributes
           @attributes = {}
-          trackable.attributes.each do |k, v|
+          changes.each do |k, v|
             next unless trackable_class.tracked_field?(k, :create)
-            modified = if changes[k]
-                         changes[k].class == Array ? changes[k].last : changes[k]
-                       else
-                         v
-                       end
-            @attributes[k] = [nil, format_field(k, modified)]
+            @attributes[k] = format_field(k, v)
           end
           insert_embeds_one_changes
           insert_embeds_many_changes

data/lib/mongoid/history/options.rb

@@ -13,29 +13,28 @@ module Mongoid
       end
 
       def prepared
-        @prepared ||= begin
-          prepare_skipped_fields
-          prepare_formatted_fields
-          parse_tracked_fields_and_relations
-          options
-        end
+        return @prepared if @prepared
+        @prepared = options.dup
+        prepare_skipped_fields
+        prepare_formatted_fields
+        parse_tracked_fields_and_relations
+        @prepared
       end
 
       private
 
       def default_options
-        @default_options ||=
-          { on: :all,
-            except: %i[created_at updated_at],
-            tracker_class_name: nil,
-            modifier_field: :modifier,
-            version_field: :version,
-            changes_method: :changes,
-            scope: scope,
-            track_create: true,
-            track_update: true,
-            track_destroy: true,
-            format: nil }
+        { on: :all,
+          except: %i[created_at updated_at],
+          tracker_class_name: nil,
+          modifier_field: :modifier,
+          version_field: :version,
+          changes_method: :changes,
+          scope: scope,
+          track_create: true,
+          track_update: true,
+          track_destroy: true,
+          format: nil }
       end
 
       # Sets the :except attributes and relations in `options` to be an [ Array <String> ]
@@ -43,15 +42,15 @@ module Mongoid
       # Removes the `nil` and duplicate entries from skipped attributes/relations list
       def prepare_skipped_fields
         # normalize :except fields to an array of database field strings
-        @options[:except] = Array(options[:except])
-        @options[:except] = options[:except].map { |field| trackable.database_field_name(field) }.compact.uniq
+        @prepared[:except] = Array(@prepared[:except])
+        @prepared[:except] = @prepared[:except].map { |field| trackable.database_field_name(field) }.compact.uniq
       end
 
       def prepare_formatted_fields
         formats = {}
 
-        if options[:format].class == Hash
-          options[:format].each do |field, format|
+        if @prepared[:format].class == Hash
+          @prepared[:format].each do |field, format|
             next if field.nil?
 
             field = trackable.database_field_name(field)
@@ -68,7 +67,7 @@ module Mongoid
           end
         end
 
-        options[:format] = formats
+        @prepared[:format] = formats
       end
 
       def parse_tracked_fields_and_relations
@@ -76,25 +75,25 @@ module Mongoid
         # when `posts: [:id, :title]`, then it will convert it to `[[:posts, [:id, :title]]]`
         # when `:foo`, then `[:foo]`
         # when `[:foo, { posts: [:id, :title] }]`, then return as is
-        @options[:on] = Array(options[:on])
+        @prepared[:on] = Array(@prepared[:on])
 
-        @options[:on] = options[:on].map { |opt| opt == :all ? :fields : opt }
+        @prepared[:on] = @prepared[:on].map { |opt| opt == :all ? :fields : opt }
 
-        if options[:on].include?(:fields)
-          @options[:on] = options[:on].reject { |opt| opt == :fields }
-          @options[:on] = options[:on] | trackable.fields.keys.map(&:to_sym) - reserved_fields.map(&:to_sym)
+        if @prepared[:on].include?(:fields)
+          @prepared[:on] = @prepared[:on].reject { |opt| opt == :fields }
+          @prepared[:on] = @prepared[:on] | trackable.fields.keys.map(&:to_sym) - reserved_fields.map(&:to_sym)
         end
 
-        if options[:on].include?(:embedded_relations)
-          @options[:on] = options[:on].reject { |opt| opt == :embedded_relations }
-          @options[:on] = options[:on] | trackable.embedded_relations.keys
+        if @prepared[:on].include?(:embedded_relations)
+          @prepared[:on] = @prepared[:on].reject { |opt| opt == :embedded_relations }
+          @prepared[:on] = @prepared[:on] | trackable.embedded_relations.keys
         end
 
-        @options[:fields] = []
-        @options[:dynamic] = []
-        @options[:relations] = { embeds_one: {}, embeds_many: {} }
+        @prepared[:fields] = []
+        @prepared[:dynamic] = []
+        @prepared[:relations] = { embeds_one: {}, embeds_many: {} }
 
-        options[:on].each do |option|
+        @prepared[:on].each do |option|
           if option.is_a?(Hash)
             option.each { |k, v| split_and_categorize(k => v) }
           else
@@ -145,7 +144,7 @@ module Mongoid
       # @param [ String ] field The database field name of field or relation to track
       # @param [ nil | Array <String | Symbol> ] field_options The tracked fields for embedded relations
       def categorize_tracked_option(field, field_options = nil)
-        return if options[:except].include?(field)
+        return if @prepared[:except].include?(field)
         return if reserved_fields.include?(field)
 
         field_options = Array(field_options)
@@ -155,23 +154,23 @@ module Mongoid
         elsif trackable.embeds_many?(field)
           track_relation(field, :embeds_many, field_options)
         elsif trackable.fields.keys.include?(field)
-          @options[:fields] << field
+          @prepared[:fields] << field
         else
-          @options[:dynamic] << field
+          @prepared[:dynamic] << field
         end
       end
 
       def track_relation(field, kind, field_options)
         relation_class = trackable.relation_class_of(field)
-        @options[:relations][kind][field] = if field_options.blank?
-                                              relation_class.fields.keys
-                                            else
-                                              %w[_id] | field_options.map { |opt| relation_class.database_field_name(opt) }
-                                               end
+        @prepared[:relations][kind][field] = if field_options.blank?
+                                               relation_class.fields.keys
+                                             else
+                                               %w[_id] | field_options.map { |opt| relation_class.database_field_name(opt) }
+                                             end
       end
 
       def reserved_fields
-        @reserved_fields ||= ['_id', '_type', options[:version_field].to_s, "#{options[:modifier_field]}_id"]
+        @reserved_fields ||= ['_id', '_type', @prepared[:version_field].to_s, "#{@prepared[:modifier_field]}_id"]
       end
     end
   end

data/lib/mongoid/history/trackable.rb

@@ -25,9 +25,9 @@ module Mongoid
           delegate :track_history?, to: 'self.class'
 
           callback_options = history_options.options.slice(:if, :unless)
-          around_update :track_update, callback_options if history_options.options[:track_update]
-          around_create :track_create, callback_options if history_options.options[:track_create]
-          around_destroy :track_destroy, callback_options if history_options.options[:track_destroy]
+          around_update :track_update, **callback_options if history_options.options[:track_update]
+          around_create :track_create, **callback_options if history_options.options[:track_create]
+          around_destroy :track_destroy, **callback_options if history_options.options[:track_destroy]
 
           unless respond_to? :mongoid_history_options
             class_attribute :mongoid_history_options, instance_accessor: false
@@ -52,13 +52,25 @@ module Mongoid
           Mongoid::Compatibility::Version.mongoid3? || (self < Mongoid::Attributes::Dynamic).present?
         end
 
-        def disable_tracking(&_block)
+        def disable_tracking
+          original_flag = Mongoid::History.store[track_history_flag]
           Mongoid::History.store[track_history_flag] = false
-          yield
+          yield if block_given?
         ensure
+          Mongoid::History.store[track_history_flag] = original_flag if block_given?
+        end
+
+        def enable_tracking
+          original_flag = Mongoid::History.store[track_history_flag]
           Mongoid::History.store[track_history_flag] = true
+          yield if block_given?
+        ensure
+          Mongoid::History.store[track_history_flag] = original_flag if block_given?
         end
 
+        alias disable_tracking! disable_tracking
+        alias enable_tracking! enable_tracking
+
         def track_history_flag
           "mongoid_history_#{name.underscore}_trackable_enabled".to_sym
         end
@@ -559,7 +571,11 @@ module Mongoid
           @tracked_fields = nil
           @tracked_embeds_one = nil
           @tracked_embeds_many = nil
-          @obfuscated_fields = nil
+        end
+
+        def inherited(subclass)
+          super
+          subclass.mongoid_history_options = Mongoid::History::Options.new(subclass, mongoid_history_options.options)
         end
       end
     end

data/lib/mongoid/history/version.rb

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

data/perf/benchmark_modified_attributes_for_create.rb

@@ -0,0 +1,65 @@
+$LOAD_PATH.push File.expand_path('../../lib', __FILE__)
+
+require 'mongoid'
+require 'mongoid/history'
+
+require 'benchmark/ips'
+require './perf/gc_suite'
+
+Mongoid.connect_to('mongoid_history_perf_test')
+Mongo::Logger.logger.level = ::Logger::FATAL
+Mongoid.purge!
+
+Attributes = Mongoid::History::Attributes
+
+module ZeroPointEight
+  class Create < Attributes::Create
+    def attributes
+      @attributes = {}
+      trackable.attributes.each do |k, v|
+        next unless trackable_class.tracked_field?(k, :create)
+        modified = if changes[k]
+                     changes[k].class == Array ? changes[k].last : changes[k]
+                   else
+                     v
+                   end
+        @attributes[k] = [nil, format_field(k, modified)]
+      end
+      insert_embeds_one_changes
+      insert_embeds_many_changes
+      @attributes
+    end
+  end
+end
+
+class Person
+  include Mongoid::Document
+  include Mongoid::History::Trackable
+
+  field :first_name, type: String
+  field :last_name, type: String
+  field :birth_date, type: Date
+  field :title, type: String
+
+  track_history on: %i[first_name last_name birth_date]
+end
+
+new_person = Person.new(first_name: 'Eliot', last_name: 'Horowitz', birth_date: '1981-05-01', title: 'CTO')
+
+Benchmark.ips do |bm|
+  bm.config(suite: GCSuite.new)
+
+  bm.report('HEAD') do
+    Attributes::Create.new(new_person).attributes
+  end
+
+  bm.report('v0.8.2') do
+    ZeroPointEight::Create.new(new_person).attributes
+  end
+
+  bm.report('v0.5.0') do
+    new_person.attributes.each_with_object({}) { |(k, v), h| h[k] = [nil, v] }.select { |k, _| new_person.class.tracked_field?(k, :create) }
+  end
+
+  bm.compare!
+end

data/perf/gc_suite.rb

@@ -0,0 +1,21 @@
+class GCSuite
+  def warming(*)
+    run_gc
+  end
+
+  def running(*)
+    run_gc
+  end
+
+  def warmup_stats(*); end
+
+  def add_report(*); end
+
+  private
+
+  def run_gc
+    GC.enable
+    GC.start
+    GC.disable
+  end
+end

data/spec/integration/subclasses_spec.rb

@@ -7,12 +7,16 @@ describe Mongoid::History::Tracker do
       include Mongoid::Timestamps
       include Mongoid::History::Trackable
 
+      track_history
+
       field :body
 
-      track_history on: [:body]
+      # force preparation of options
+      history_trackable_options
     end
 
     class Prompt < Element
+      field :head
     end
 
     class User
@@ -31,11 +35,13 @@ describe Mongoid::History::Tracker do
   it 'tracks subclass create and update' do
     prompt = Prompt.new(modifier: user)
     expect { prompt.save! }.to change(Tracker, :count).by(1)
-    expect { prompt.update_attributes!(body: 'one') }.to change(Tracker, :count).by(1)
+    expect { prompt.update_attributes!(body: 'one', head: 'two') }.to change(Tracker, :count).by(1)
     prompt.undo! user
     expect(prompt.body).to be_blank
+    expect(prompt.head).to be_blank
     prompt.redo! user, 2
     expect(prompt.body).to eq('one')
+    expect(prompt.head).to eq('two')
     expect { prompt.destroy }.to change(Tracker, :count).by(1)
   end
 end

data/spec/unit/options_spec.rb

@@ -84,6 +84,12 @@ describe Mongoid::History::Options do
   end
 
   describe '#parse' do
+    it 'does not mutate the original options' do
+      original_options = service.options.dup
+      service.prepared
+      expect(service.options).to eq original_options
+    end
+
     describe '#default_options' do
       let(:expected_options) do
         {

data/spec/unit/trackable_spec.rb

@@ -270,6 +270,11 @@ describe Mongoid::History::Trackable do
 
     describe '#track_history?' do
       shared_examples_for 'history tracking' do
+        after do
+          Mongoid::History.store[Mongoid::History::GLOBAL_TRACK_HISTORY_FLAG] = true
+          Mongoid::History.store[MyModel.track_history_flag] = true
+        end
+
         context 'when tracking is globally enabled' do
           it 'should be enabled on the current thread' do
             expect(Mongoid::History.enabled?).to eq(true)
@@ -283,7 +288,40 @@ describe Mongoid::History::Trackable do
             end
           end
 
-          it 'should be rescued if an exception occurs' do
+          it 'should be enabled within enable_tracking' do
+            MyModel.disable_tracking do
+              MyModel.enable_tracking do
+                expect(Mongoid::History.enabled?).to eq(true)
+                expect(MyModel.new.track_history?).to eq(true)
+              end
+            end
+          end
+
+          it 'should still be disabled after completing a nested disable_tracking' do
+            MyModel.disable_tracking do
+              MyModel.disable_tracking {}
+              expect(Mongoid::History.enabled?).to eq(true)
+              expect(MyModel.new.track_history?).to eq(false)
+            end
+          end
+
+          it 'should still be enabled after completing a nested enable_tracking' do
+            MyModel.enable_tracking do
+              MyModel.enable_tracking {}
+              expect(Mongoid::History.enabled?).to eq(true)
+              expect(MyModel.new.track_history?).to eq(true)
+            end
+          end
+
+          it 'should restore the original state after completing enable_tracking' do
+            MyModel.disable_tracking do
+              MyModel.enable_tracking {}
+              expect(Mongoid::History.enabled?).to eq(true)
+              expect(MyModel.new.track_history?).to eq(false)
+            end
+          end
+
+          it 'should be rescued if an exception occurs in disable_tracking' do
             begin
               MyModel.disable_tracking do
                 raise 'exception'
@@ -294,6 +332,33 @@ describe Mongoid::History::Trackable do
             expect(MyModel.new.track_history?).to eq(true)
           end
 
+          it 'should be rescued if an exception occurs in enable_tracking' do
+            MyModel.disable_tracking do
+              begin
+                MyModel.enable_tracking do
+                  raise 'exception'
+                end
+              rescue
+              end
+              expect(Mongoid::History.enabled?).to eq(true)
+              expect(MyModel.new.track_history?).to eq(false)
+            end
+          end
+
+          it 'should stay disabled if disable_tracking called without a block' do
+            MyModel.disable_tracking!
+            expect(Mongoid::History.enabled?).to eq(true)
+            expect(MyModel.new.track_history?).to eq(false)
+          end
+
+          it 'should stay enabled if enable_tracking called without a block' do
+            MyModel.disable_tracking do
+              MyModel.enable_tracking!
+              expect(Mongoid::History.enabled?).to eq(true)
+              expect(MyModel.new.track_history?).to eq(true)
+            end
+          end
+
           context 'with multiple classes' do
             before :each do
               class MyModel2
@@ -317,7 +382,7 @@ describe Mongoid::History::Trackable do
           end
         end
 
-        context 'when tracking is globally disabled' do
+        context 'when changing global tracking' do
           it 'should be disabled by the global disablement' do
             Mongoid::History.disable do
               expect(Mongoid::History.enabled?).to eq(false)
@@ -325,6 +390,41 @@ describe Mongoid::History::Trackable do
             end
           end
 
+          it 'should be enabled by the global enablement' do
+            Mongoid::History.disable do
+              Mongoid::History.enable do
+                expect(Mongoid::History.enabled?).to eq(true)
+                expect(MyModel.new.track_history?).to eq(true)
+              end
+            end
+          end
+
+          it 'should restore the original state after completing enable' do
+            Mongoid::History.disable do
+              Mongoid::History.enable {}
+              expect(Mongoid::History.enabled?).to eq(false)
+              expect(MyModel.new.track_history?).to eq(false)
+            end
+          end
+
+          it 'should still be disabled after completing a nested disable' do
+            Mongoid::History.disable do
+              Mongoid::History.disable {}
+              expect(Mongoid::History.enabled?).to eq(false)
+              expect(MyModel.new.track_history?).to eq(false)
+            end
+          end
+
+          it 'should still be enabled after completing a nested enable' do
+            Mongoid::History.disable do
+              Mongoid::History.enable do
+                Mongoid::History.enable {}
+                expect(Mongoid::History.enabled?).to eq(true)
+                expect(MyModel.new.track_history?).to eq(true)
+              end
+            end
+          end
+
           it 'should be disabled within disable_tracking' do
             Mongoid::History.disable do
               MyModel.disable_tracking do
@@ -334,7 +434,7 @@ describe Mongoid::History::Trackable do
             end
           end
 
-          it 'should be rescued if an exception occurs' do
+          it 'should be rescued if an exception occurs in disable' do
             Mongoid::History.disable do
               begin
                 MyModel.disable_tracking do
@@ -347,6 +447,33 @@ describe Mongoid::History::Trackable do
             end
           end
 
+          it 'should be rescued if an exception occurs in enable' do
+            Mongoid::History.disable do
+              begin
+                Mongoid::History.enable do
+                  raise 'exception'
+                end
+              rescue
+              end
+              expect(Mongoid::History.enabled?).to eq(false)
+              expect(MyModel.new.track_history?).to eq(false)
+            end
+          end
+
+          it 'should stay disabled if disable called without a block' do
+            Mongoid::History.disable!
+            expect(Mongoid::History.enabled?).to eq(false)
+            expect(MyModel.new.track_history?).to eq(false)
+          end
+
+          it 'should stay enabled if enable called without a block' do
+            Mongoid::History.disable do
+              Mongoid::History.enable!
+              expect(Mongoid::History.enabled?).to eq(true)
+              expect(MyModel.new.track_history?).to eq(true)
+            end
+          end
+
           context 'with multiple classes' do
             before :each do
               class MyModel2
@@ -361,7 +488,7 @@ describe Mongoid::History::Trackable do
               Object.send(:remove_const, :MyModel2)
             end
 
-            it 'should be disabled only for the class that calls disable_tracking' do
+            it 'should be disabled for all classes' do
               Mongoid::History.disable do
                 MyModel.disable_tracking do
                   expect(Mongoid::History.enabled?).to eq(false)
@@ -412,7 +539,7 @@ describe Mongoid::History::Trackable do
             track_history on: :key, changes_method: :my_changes, track_create: true
 
             def my_changes
-              changes.merge('key' => "Save history-#{key}")
+              changes.merge('key' => ["Save history-#{key}", "Save history-#{key}"])
             end
           end
         end
@@ -813,7 +940,7 @@ describe Mongoid::History::Trackable do
         track_history on: :key, changes_method: :my_changes, track_create: true
 
         def my_changes
-          changes.merge('key' => "Save history-#{key}")
+          changes.merge('key' => ["Save history-#{key}", "Save history-#{key}"])
         end
       end
 
@@ -836,4 +963,25 @@ describe Mongoid::History::Trackable do
       m.save!
     end
   end
+
+  context "subclassing a #{described_class}" do
+    before :each do
+      MyModel.track_history(track_destroy: false)
+
+      class MySubclassModel < MyModel
+      end
+    end
+
+    after :each do
+      Object.send(:remove_const, :MySubclassModel)
+    end
+
+    describe '.inherited' do
+      it 'creates new history options for the subclass' do
+        options = MySubclassModel.mongoid_history_options
+        expect(options.trackable).to eq MySubclassModel
+        expect(options.options).to eq MyModel.mongoid_history_options.options
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-history
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Aaron Qian
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: easy_diff
@@ -112,6 +112,8 @@ files:
 - lib/mongoid/history/tracker.rb
 - lib/mongoid/history/version.rb
 - mongoid-history.gemspec
+- perf/benchmark_modified_attributes_for_create.rb
+- perf/gc_suite.rb
 - spec/integration/embedded_in_polymorphic_spec.rb
 - spec/integration/integration_spec.rb
 - spec/integration/multi_relation_spec.rb
@@ -158,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Track and audit, undo and redo changes on Mongoid documents.