audited 4.10.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e774f1f27e84aaa6f3ad9160eaba9b0e5eda0df9202cb5acaf405de13071c4d3
-  data.tar.gz: affeec219575b7032c73f03d69d839aeb7ad81ab7c53e2e636bea0243d66ac8f
+  metadata.gz: 52f7d297a07e673c3f45866a6ec8cb02c6228cdd6c1c0f7d1043c5eacfd104e2
+  data.tar.gz: 2776fa266fb211bfc0c0d939fd001d862408196cd0e902e0417f8a3696ee4ba1
 SHA512:
-  metadata.gz: df852876685671788eeec0cd604a5771ed5bd096d466c10f1b9798774681c03749b2280bf4794d0cef707080c4f2e22464adbb90ac39f077132a0d3630c85c8c
-  data.tar.gz: bf555f179f6c33d4493aa984c1163e1ae2bcf7985b1ff7fecbe52012b3d2140c364098478aca57817c8991747a4009e4b184e63227621dc752cd8fe5ccf8a516
+  metadata.gz: 172a29b25cdb1dfdf5c04ce42448e7ba1b864347a7783fb06bdbc277f4fa3dfe18d75c03d37ee7fd2ad93e2a78d9a34b02a8d08c67a0f46518c202d2b3534ec2
+  data.tar.gz: 8b86c7befab204c98b72f81f8227991d821c4f173d32191e256cdad0bb4cd997bc9c0c7715bacae03539a919ec57cb25e6911e855f38845bd7389318fab9fcba

data/.standard.yml

@@ -0,0 +1,5 @@
+ruby_version: 2.3
+ignore:
+  - lib/generators/audited/templates/**/*
+  - vendor/bundle/**/*
+  - gemfiles/vendor/bundle/**/*

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - 2.6.3
+  - 2.3.8
+  - 2.4.10
+  - 2.5.9
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
   - ruby-head
 env:
   - DB=SQLITE
@@ -17,15 +19,7 @@ services:
 before_install:
   # https://github.com/travis-ci/travis-ci/issues/8978
   - "travis_retry gem update --system"
-  # Rails 4.2 has a bundler 1.x requirement
-  - if [ $BUNDLE_GEMFILE = $PWD/gemfiles/rails42.gemfile ]; then
-      travis_retry gem install -v '1.17.3' bundler;
-      bundle _1.17.3_ install;
-    else
-      travis_retry gem install bundler;
-    fi
 gemfile:
-  - gemfiles/rails42.gemfile
   - gemfiles/rails50.gemfile
   - gemfiles/rails51.gemfile
   - gemfiles/rails52.gemfile
@@ -33,20 +27,30 @@ gemfile:
   - gemfiles/rails61.gemfile
 matrix:
   include:
-    - rvm: 2.6.3
-      script: bundle exec rubocop --parallel
-      env: DB=rubocop # make travis build display nicer
+    - rvm: 2.6.7
+      script: bundle exec standardrb
+      env: DB=standard # make travis build display nicer
   exclude:
-    - rvm: 2.3.7
+    - rvm: 2.3.8
       gemfile: gemfiles/rails61.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.4.10
       gemfile: gemfiles/rails61.gemfile
-    - rvm: 2.3.7
+    - rvm: 2.3.8
       gemfile: gemfiles/rails60.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.4.10
       gemfile: gemfiles/rails60.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.6.7
       gemfile: gemfiles/rails42.gemfile
+    - rvm: 2.7.3
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails51.gemfile
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails52.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails42.gemfile
   allow_failures:
@@ -59,5 +63,5 @@ branches:
 notifications:
   webhooks:
     urls:
-    - http://buildlight.collectiveidea.com/
+    - https://buildlight.collectiveidea.com/
     on_start: always

data/Appraisals

@@ -1,44 +1,36 @@
 # Include DB adapters matching the version requirements in
 # rails/activerecord/lib/active_record/connection_adapters/*adapter.rb
 
-appraise 'rails42' do
-  gem 'rails', '~> 4.2.0'
-  gem 'protected_attributes'
-  gem "mysql2", ">= 0.3.13", "< 0.6.0"
-  gem "pg", "~> 0.15"
-  gem "sqlite3", "~> 1.3.6"
-end
-
-appraise 'rails50' do
-  gem 'rails', '~> 5.0.0'
+appraise "rails50" do
+  gem "rails", "~> 5.0.0"
   gem "mysql2", ">= 0.3.18", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
 end
 
-appraise 'rails51' do
-  gem 'rails', '~> 5.1.4'
+appraise "rails51" do
+  gem "rails", "~> 5.1.4"
   gem "mysql2", ">= 0.3.18", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
 end
 
-appraise 'rails52' do
-  gem 'rails', '>= 5.2.0', '< 5.3'
+appraise "rails52" do
+  gem "rails", ">= 5.2.0", "< 5.3"
   gem "mysql2", ">= 0.4.4", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
 end
 
-appraise 'rails60' do
-  gem 'rails', '>= 6.0.0', '< 6.1'
+appraise "rails60" do
+  gem "rails", ">= 6.0.0", "< 6.1"
   gem "mysql2", ">= 0.4.4"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.4"
 end
 
-appraise 'rails61' do
-  gem 'rails', '>= 6.1.0', '< 6.2'
+appraise "rails61" do
+  gem "rails", ">= 6.1.0", "< 6.2"
   gem "mysql2", ">= 0.4.4"
   gem "pg", ">= 1.1", "< 2.0"
   gem "sqlite3", "~> 1.4"

data/CHANGELOG.md

@@ -1,6 +1,34 @@
 # Audited ChangeLog
 
-## Unreleased
+## 5.0.0 (2021-06-10)
+
+Improved
+
+- Fixes an issue where array attributes were not deserialized properly - @cfeckardt, @yuki24
+  [#448](https://github.com/collectiveidea/audited/pull/448)
+  [#576](https://github.com/collectiveidea/audited/pull/576)
+- Improve error message on audit_comment and allow for i18n override - @james
+  [#523](https://github.com/collectiveidea/audited/pull/523/)
+- Don't require a comment if only non-audited fields are changed - @james
+  [#522](https://github.com/collectiveidea/audited/pull/522/)
+- Readme updates - @gourshete
+  [#525](https://github.com/collectiveidea/audited/pull/525)
+- Allow restoring previous enum behavior with flag - @travisofthenorth
+  [#526](https://github.com/collectiveidea/audited/pull/526)
+- Follow Rails Autoloading conventions - @duncanjbrown
+  [#532](https://github.com/collectiveidea/audited/pull/532)
+- Fix own_and_associated_audits for STI Models - @eric-hemasystems
+  [#533](https://github.com/collectiveidea/audited/pull/533)
+- Rails 6.1 Improvements - @okuramasafumi, @marcrohloff
+  [#563](https://github.com/collectiveidea/audited/pull/563)
+  [#544](https://github.com/collectiveidea/audited/pull/544)
+- Use Thread local variables instead of Fibers - @arathunku
+  [#568](https://github.com/collectiveidea/audited/pull/568)
+
+Changed
+
+- Drop support for Rails 4 - @travisofthenorth
+  [#527](https://github.com/collectiveidea/audited/pull/527)
 
 ## 4.10.0 (2021-01-07)
 

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec name: "audited"

data/README.md

@@ -1,10 +1,13 @@
 Audited [![Build Status](https://secure.travis-ci.org/collectiveidea/audited.svg)](http://travis-ci.org/collectiveidea/audited) [![Code Climate](https://codeclimate.com/github/collectiveidea/audited.svg)](https://codeclimate.com/github/collectiveidea/audited) [![Security](https://hakiri.io/github/collectiveidea/audited/master.svg)](https://hakiri.io/github/collectiveidea/audited/master)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 =======
 
 **Audited** (previously acts_as_audited) is an ORM extension that logs all changes to your models. Audited can also record who made those changes, save comments and associate models related to the changes.
 
-Audited currently (4.x) works with Rails 6.1, Rails 6.0, 5.2, 5.1, 5.0 and 4.2.
 
+Audited currently (5.x) works with Rails 6.1, 6.0, 5.2, 5.1, and 5.0.
+
+For Rails 4, use gem version 4.x
 For Rails 3, use gem version 3.0 or see the [3.0-stable branch](https://github.com/collectiveidea/audited/tree/3.0-stable).
 
 ## Supported Rubies
@@ -153,7 +156,7 @@ end
 
 ### Limiting stored audits
 
-You can limit the number of audits stored for your model. To configure limiting for all audited models, put the following in an initializer:
+You can limit the number of audits stored for your model. To configure limiting for all audited models, put the following in an initializer file (`config/initializers/audited.rb`):
 
 ```ruby
 Audited.max_audits = 10 # keep only 10 latest audits
@@ -192,7 +195,7 @@ class PostsController < ApplicationController
 end
 ```
 
-To use a method other than `current_user`, put the following in an initializer:
+To use a method other than `current_user`, put the following in an initializer file (`config/initializers/audited.rb`):
 
 ```ruby
 Audited.current_user_method = :authenticated_user
@@ -388,6 +391,16 @@ Audited.config do |config|
 end
 ```
 
+### Enum Storage
+
+In 4.10, the default behavior for enums changed from storing the value synthesized by Rails to the value stored in the DB. You can restore the previous behavior by setting the store_synthesized_enums configuration value:
+
+```ruby
+# config/initializers/audited.rb
+
+Audited.store_synthesized_enums = true
+```
+
 ## Support
 
 You can find documentation at: http://rdoc.info/github/collectiveidea/audited

data/Rakefile

@@ -1,17 +1,17 @@
 #!/usr/bin/env rake
 
-require 'bundler/gem_helper'
-require 'rspec/core/rake_task'
-require 'rake/testtask'
-require 'appraisal'
+require "bundler/gem_helper"
+require "rspec/core/rake_task"
+require "rake/testtask"
+require "appraisal"
 
-Bundler::GemHelper.install_tasks(name: 'audited')
+Bundler::GemHelper.install_tasks(name: "audited")
 
 RSpec::Core::RakeTask.new(:spec)
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
 end
 

data/lib/audited-rspec.rb

@@ -1,4 +1,6 @@
-require 'audited/rspec_matchers'
+# frozen_string_literal: true
+
+require "audited/rspec_matchers"
 module RSpec::Matchers
   include Audited::RspecMatchers
 end

data/lib/audited.rb

@@ -1,8 +1,15 @@
-require 'active_record'
+# frozen_string_literal: true
+
+require "active_record"
 
 module Audited
   class << self
-    attr_accessor :ignored_attributes, :current_user_method, :max_audits, :auditing_enabled
+    attr_accessor \
+      :auditing_enabled,
+      :current_user_method,
+      :ignored_attributes,
+      :max_audits,
+      :store_synthesized_enums
     attr_writer :audit_class
 
     def audit_class
@@ -10,7 +17,13 @@ module Audited
     end
 
     def store
-      Thread.current[:audited_store] ||= {}
+      current_store_value = Thread.current.thread_variable_get(:audited_store)
+
+      if current_store_value.nil?
+        Thread.current.thread_variable_set(:audited_store, {})
+      else
+        current_store_value
+      end
     end
 
     def config
@@ -18,15 +31,19 @@ module Audited
     end
   end
 
-  @ignored_attributes = %w(lock_version created_at updated_at created_on updated_on)
+  @ignored_attributes = %w[lock_version created_at updated_at created_on updated_on]
 
   @current_user_method = :current_user
   @auditing_enabled = true
+  @store_synthesized_enums = false
 end
 
-require 'audited/auditor'
-require 'audited/audit'
+require "audited/auditor"
+require "audited/audit"
 
-::ActiveRecord::Base.send :include, Audited::Auditor
+ActiveSupport.on_load :active_record do
+  include Audited::Auditor
+end
 
-require 'audited/sweeper'
+require "audited/sweeper"
+require "audited/railtie"

data/lib/audited/audit.rb

@@ -1,4 +1,6 @@
-require 'set'
+# frozen_string_literal: true
+
+require "set"
 
 module Audited
   # Audit saves the changes to ActiveRecord models.  It has the following attributes:
@@ -38,8 +40,8 @@ module Audited
   end
 
   class Audit < ::ActiveRecord::Base
-    belongs_to :auditable,  polymorphic: true
-    belongs_to :user,       polymorphic: true
+    belongs_to :auditable, polymorphic: true
+    belongs_to :user, polymorphic: true
     belongs_to :associated, polymorphic: true
 
     before_create :set_version_number, :set_audit_user, :set_request_uuid, :set_remote_address
@@ -49,16 +51,16 @@ module Audited
 
     serialize :audited_changes, YAMLIfTextColumnType
 
-    scope :ascending,     ->{ reorder(version: :asc) }
-    scope :descending,    ->{ reorder(version: :desc)}
-    scope :creates,       ->{ where(action: 'create')}
-    scope :updates,       ->{ where(action: 'update')}
-    scope :destroys,      ->{ where(action: 'destroy')}
+    scope :ascending, -> { reorder(version: :asc) }
+    scope :descending, -> { reorder(version: :desc) }
+    scope :creates, -> { where(action: "create") }
+    scope :updates, -> { where(action: "update") }
+    scope :destroys, -> { where(action: "destroy") }
 
-    scope :up_until,      ->(date_or_time){ where("created_at <= ?", date_or_time) }
-    scope :from_version,  ->(version){ where('version >= ?', version) }
-    scope :to_version,    ->(version){ where('version <= ?', version) }
-    scope :auditable_finder, ->(auditable_id, auditable_type){ where(auditable_id: auditable_id, auditable_type: auditable_type)}
+    scope :up_until, ->(date_or_time) { where("created_at <= ?", date_or_time) }
+    scope :from_version, ->(version) { where("version >= ?", version) }
+    scope :to_version, ->(version) { where("version <= ?", version) }
+    scope :auditable_finder, ->(auditable_id, auditable_type) { where(auditable_id: auditable_id, auditable_type: auditable_type) }
     # Return all audits older than the current one.
     def ancestors
       self.class.ascending.auditable_finder(auditable_id, auditable_type).to_version(version)
@@ -75,31 +77,28 @@ module Audited
 
     # Returns a hash of the changed attributes with the new values
     def new_attributes
-      (audited_changes || {}).inject({}.with_indifferent_access) do |attrs, (attr, values)|
-        attrs[attr] = values.is_a?(Array) ? values.last : values
-        attrs
+      (audited_changes || {}).each_with_object({}.with_indifferent_access) do |(attr, values), attrs|
+        attrs[attr] = (action == "update" ? values.last : values)
       end
     end
 
     # Returns a hash of the changed attributes with the old values
     def old_attributes
-      (audited_changes || {}).inject({}.with_indifferent_access) do |attrs, (attr, values)|
-        attrs[attr] = Array(values).first
-
-        attrs
+      (audited_changes || {}).each_with_object({}.with_indifferent_access) do |(attr, values), attrs|
+        attrs[attr] = (action == "update" ? values.first : values)
       end
     end
 
     # Allows user to undo changes
     def undo
       case action
-      when 'create'
+      when "create"
         # destroys a newly created record
         auditable.destroy!
-      when 'destroy'
+      when "destroy"
         # creates a new record with the destroyed record attributes
         auditable_type.constantize.create!(audited_changes)
-      when 'update'
+      when "update"
         # changes back attributes
         auditable.update!(audited_changes.transform_values(&:first))
       else
@@ -147,7 +146,7 @@ module Audited
       audits.each_with_object({}) do |audit, all|
         all.merge!(audit.new_attributes)
         all[:audit_version] = audit.version
-     end
+      end
     end
 
     # @private
@@ -172,10 +171,10 @@ module Audited
     private
 
     def set_version_number
-      if action == 'create'
+      if action == "create"
         self.version = 1
       else
-        collection = Rails::VERSION::MAJOR == 6 ? self.class.unscoped : self.class
+        collection = Rails::VERSION::MAJOR >= 6 ? self.class.unscoped : self.class
         max = collection.auditable_finder(auditable_id, auditable_type).maximum(:version) || 0
         self.version = max + 1
       end

data/lib/audited/auditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Audited
   # Specify this act if you want changes to your model to be saved in an
   # audit table.  This assumes there is an audits table ready.
@@ -64,7 +66,7 @@ module Audited
         include Audited::Auditor::AuditedInstanceMethods
 
         class_attribute :audit_associated_with, instance_writer: false
-        class_attribute :audited_options,       instance_writer: false
+        class_attribute :audited_options, instance_writer: false
         attr_accessor :audit_version, :audit_comment
 
         self.audited_options = options
@@ -80,8 +82,8 @@ module Audited
         has_many :audits, -> { order(version: :asc) }, as: :auditable, class_name: Audited.audit_class.name, inverse_of: :auditable
         Audited.audit_class.audited_class_names << to_s
 
-        after_create :audit_create    if audited_options[:on].include?(:create)
-        before_update :audit_update   if audited_options[:on].include?(:update)
+        after_create :audit_create if audited_options[:on].include?(:create)
+        before_update :audit_update if audited_options[:on].include?(:update)
         before_destroy :audit_destroy if audited_options[:on].include?(:destroy)
 
         # Define and set after_audit and around_audit callbacks. This might be useful if you want
@@ -100,8 +102,8 @@ module Audited
     end
 
     module AuditedInstanceMethods
-      REDACTED = '[REDACTED]'
-      
+      REDACTED = "[REDACTED]"
+
       # Temporarily turns off auditing while saving.
       def save_without_auditing
         without_auditing { save }
@@ -142,7 +144,7 @@ module Audited
       def revisions(from_version = 1)
         return [] unless audits.from_version(from_version).exists?
 
-        all_audits = audits.select([:audited_changes, :version]).to_a
+        all_audits = audits.select([:audited_changes, :version, :action]).to_a
         targeted_audits = all_audits.select { |audit| audit.version >= from_version }
 
         previous_attributes = reconstruct_attributes(all_audits - targeted_audits)
@@ -156,7 +158,7 @@ module Audited
       # Get a specific revision specified by the version number, or +:previous+
       # Returns nil for versions greater than revisions count
       def revision(version)
-        if version == :previous || self.audits.last.version >= version
+        if version == :previous || audits.last.version >= version
           revision_with Audited.audit_class.reconstruct_attributes(audits_to(version))
         end
       end
@@ -176,9 +178,9 @@ module Audited
       # Returns a list combined of record audits and associated audits.
       def own_and_associated_audits
         Audited.audit_class.unscoped
-        .where('(auditable_type = :type AND auditable_id = :id) OR (associated_type = :type AND associated_id = :id)',
-          type: self.class.name, id: id)
-        .order(created_at: :desc)
+          .where("(auditable_type = :type AND auditable_id = :id) OR (associated_type = :type AND associated_id = :id)",
+            type: self.class.base_class.name, id: id)
+          .order(created_at: :desc)
       end
 
       # Combine multiple audits into one.
@@ -198,12 +200,12 @@ module Audited
       def revision_with(attributes)
         dup.tap do |revision|
           revision.id = id
-          revision.send :instance_variable_set, '@new_record', destroyed?
-          revision.send :instance_variable_set, '@persisted', !destroyed?
-          revision.send :instance_variable_set, '@readonly', false
-          revision.send :instance_variable_set, '@destroyed', false
-          revision.send :instance_variable_set, '@_destroyed', false
-          revision.send :instance_variable_set, '@marked_for_destruction', false
+          revision.send :instance_variable_set, "@new_record", destroyed?
+          revision.send :instance_variable_set, "@persisted", !destroyed?
+          revision.send :instance_variable_set, "@readonly", false
+          revision.send :instance_variable_set, "@destroyed", false
+          revision.send :instance_variable_set, "@_destroyed", false
+          revision.send :instance_variable_set, "@marked_for_destruction", false
           Audited.audit_class.assign_revision_attributes(revision, attributes)
 
           # Remove any association proxies so that they will be recreated
@@ -237,12 +239,14 @@ module Audited
       end
 
       def normalize_enum_changes(changes)
+        return changes if Audited.store_synthesized_enums
+
         self.class.defined_enums.each do |name, values|
           if changes.has_key?(name)
             changes[name] = \
               if changes[name].is_a?(Array)
                 changes[name].map { |v| values[v] }
-              elsif rails_below?('5.0')
+              elsif rails_below?("5.0")
                 changes[name]
               else
                 values[changes[name]]
@@ -256,12 +260,12 @@ module Audited
         [audited_options[:redacted]].flatten.compact.each do |option|
           changes = filtered_changes[option.to_s]
           new_value = audited_options[:redaction_value] || REDACTED
-          if changes.is_a? Array
-            values = changes.map { new_value }
+          values = if changes.is_a? Array
+            changes.map { new_value }
           else
-            values = new_value
+            new_value
           end
-          hash = Hash[option.to_s, values]
+          hash = {option.to_s => values}
           filtered_changes.merge!(hash)
         end
 
@@ -274,31 +278,33 @@ module Audited
 
       def audits_to(version = nil)
         if version == :previous
-          version = if self.audit_version
-                      self.audit_version - 1
-                    else
-                      previous = audits.descending.offset(1).first
-                      previous ? previous.version : 1
-                    end
+          version = if audit_version
+            audit_version - 1
+          else
+            previous = audits.descending.offset(1).first
+            previous ? previous.version : 1
+          end
         end
         audits.to_version(version)
       end
 
       def audit_create
-        write_audit(action: 'create', audited_changes: audited_attributes,
+        write_audit(action: "create", audited_changes: audited_attributes,
                     comment: audit_comment)
       end
 
       def audit_update
         unless (changes = audited_changes).empty? && (audit_comment.blank? || audited_options[:update_with_comment_only] == false)
-          write_audit(action: 'update', audited_changes: changes,
+          write_audit(action: "update", audited_changes: changes,
                       comment: audit_comment)
         end
       end
 
       def audit_destroy
-        write_audit(action: 'destroy', audited_changes: audited_attributes,
-                    comment: audit_comment) unless new_record?
+        unless new_record?
+          write_audit(action: "destroy", audited_changes: audited_attributes,
+                      comment: audit_comment)
+        end
       end
 
       def write_audit(attrs)
@@ -308,7 +314,7 @@ module Audited
         if auditing_enabled
           run_callbacks(:audit) {
             audit = audits.create(attrs)
-            combine_audits_if_needed if attrs[:action] != 'create'
+            combine_audits_if_needed if attrs[:action] != "create"
             audit
           }
         end
@@ -316,14 +322,15 @@ module Audited
 
       def presence_of_audit_comment
         if comment_required_state?
-          errors.add(:audit_comment, "Comment can't be blank!") unless audit_comment.present?
+          errors.add(:audit_comment, :blank) unless audit_comment.present?
         end
       end
 
       def comment_required_state?
         auditing_enabled &&
-          ((audited_options[:on].include?(:create) && self.new_record?) ||
-          (audited_options[:on].include?(:update) && self.persisted? && self.changed?))
+          audited_changes.present? &&
+          ((audited_options[:on].include?(:create) && new_record?) ||
+          (audited_options[:on].include?(:update) && persisted? && changed?))
       end
 
       def combine_audits_if_needed
@@ -336,8 +343,7 @@ module Audited
 
       def require_comment
         if auditing_enabled && audit_comment.blank?
-          errors.add(:audit_comment, "Comment can't be blank!")
-          return false if Rails.version.start_with?('4.')
+          errors.add(:audit_comment, :blank)
           throw(:abort)
         end
       end
@@ -347,7 +353,7 @@ module Audited
       end
 
       def auditing_enabled
-        return run_conditional_check(audited_options[:if]) &&
+        run_conditional_check(audited_options[:if]) &&
           run_conditional_check(audited_options[:unless], matching: false) &&
           self.class.auditing_enabled
       end
@@ -365,7 +371,7 @@ module Audited
         audits.each { |audit| attributes.merge!(audit.new_attributes) }
         attributes
       end
-    end # InstanceMethods
+    end
 
     module AuditedClassMethods
       # Returns an array of columns that are audited. See non_audited_columns