audited 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f924caa522dc6d65c88066c2d28416dfcef844efa85bdef056da226db12a8984
-  data.tar.gz: 63bdef3cd4aefea080eb36e6b7c394f5d97b465e3376027a68e3c28f1b278d5c
+  metadata.gz: e18ef251e91f3a66070afa58f5d9e5f12ac81777ca5389b3939a9fd349602e92
+  data.tar.gz: c0fbd5a136b6e43ae6e39229de6690811d24adf4f1f2f555a49752cac3bd230b
 SHA512:
-  metadata.gz: acbc5581e27594c84ad817ac7e2f90e02d34786106689a943177552890205d4acfaa5a7ac5489b1a0fbdbc5196028d462e4540d5253ee78b2612bc8f03abfcad
-  data.tar.gz: 532724043c0c57659a3c3f3d0eaf21c832a6c3863a8607bb802d882bf13b4579e8b051265e6c4082a51bdbc2291f7466508e03c7cb67df90bda6b8c234a6d7a4
+  metadata.gz: 9bbb38bc63b2cbafd43b7090ab307acde19e9ca21d22710ddc7b42a5a10fc08f0151c1b43b557a1978699005ac66ce7932eec7f8d5f3de6b3c14d7a4d77c73af
+  data.tar.gz: 707e5ddda189015b0475e663d7fb4faa3576a1a373dbe3f78436fce96e97cb7ed0a852fc328cec177716f95e035a45dd291f70888ba783572e4b854a84721a45

data/.github/workflows/ci.yml

@@ -0,0 +1,128 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1]
+        appraisal:
+          - rails50
+          - rails51
+          - rails52
+          - rails60
+          - rails61
+          - rails70
+        db: [POSTGRES, MYSQL, SQLITE]
+        exclude:
+          # MySQL has issues on Ruby 2.3
+          # https://github.com/ruby/setup-ruby/issues/150
+          - ruby: 2.3
+            db: MYSQL
+
+          # PostgresSQL is segfaulting on 2.3
+          # Doesn't seem worth solving.
+          - ruby: 2.3
+            db: POSTGRES
+
+          # Rails 5.0 supports Ruby 2.2-2.4
+          - appraisal: rails50
+            ruby: 2.5
+          - appraisal: rails50
+            ruby: 2.6
+          - appraisal: rails50
+            ruby: 2.7
+          - appraisal: rails50
+            ruby: 3.0
+          - appraisal: rails50
+            ruby: 3.1
+
+          # Rails 5.1 supports Ruby 2.2-2.5
+          - appraisal: rails51
+            ruby: 2.6
+          - appraisal: rails51
+            ruby: 2.7
+          - appraisal: rails51
+            ruby: 3.0
+          - appraisal: rails51
+            ruby: 3.1
+
+          # Rails 5.2 supports Ruby 2.2-2.5
+          - appraisal: rails52
+            ruby: 2.6
+          - appraisal: rails52
+            ruby: 2.7
+          - appraisal: rails52
+            ruby: 3.0
+          - appraisal: rails52
+            ruby: 3.1
+
+          # Rails 6.0 supports Ruby 2.5-2.7
+          - appraisal: rails60
+            ruby: 2.3
+          - appraisal: rails60
+            ruby: 2.4
+          - appraisal: rails60
+            ruby: 3.0
+          - appraisal: rails60
+            ruby: 3.1
+
+          # Rails 6.1 supports Ruby 2.5+
+          - appraisal: rails61
+            ruby: 2.3
+          - appraisal: rails61
+            ruby: 2.4
+
+          # Rails 7 supports Ruby 2.7+
+          - appraisal: rails70
+            ruby: 2.3
+          - appraisal: rails70
+            ruby: 2.4
+          - appraisal: rails70
+            ruby: 2.5
+          - appraisal: rails70
+            ruby: 2.6
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: audited_test
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+      DB_DATABASE: audited_test
+      DB_USER: root
+      DB_PASSWORD: 'root'
+      DB_HOST: localhost
+
+    steps:
+    - name: Setup MySQL
+      run: |
+        sudo /etc/init.d/mysql start
+        mysql -e 'CREATE DATABASE audited_test;' -uroot -proot
+        mysql -e 'SHOW DATABASES;' -uroot -proot
+    - uses: actions/checkout@v3
+    - name: Copy Gemfile
+      run: sed 's/\.\././' gemfiles/${{ matrix.appraisal }}.gemfile > Gemfile
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run tests
+      env:
+        DB: ${{ matrix.db }}
+      run: bundle exec rake

data/Appraisals

@@ -6,6 +6,7 @@ appraise "rails50" do
   gem "mysql2", ">= 0.3.18", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
+  gem "psych", "~> 3.1"
 end
 
 appraise "rails51" do
@@ -13,13 +14,15 @@ appraise "rails51" do
   gem "mysql2", ">= 0.3.18", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
+  gem "psych", "~> 3.1"
 end
 
 appraise "rails52" do
-  gem "rails", ">= 5.2.0", "< 5.3"
+  gem "rails", ">= 5.2.8.1", "< 5.3"
   gem "mysql2", ">= 0.4.4", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
+  gem "psych", "~> 3.1"
 end
 
 appraise "rails60" do
@@ -35,3 +38,10 @@ appraise "rails61" do
   gem "pg", ">= 1.1", "< 2.0"
   gem "sqlite3", "~> 1.4"
 end
+
+appraise "rails70" do
+  gem "rails", ">= 7.0.0", "< 7.1"
+  gem "mysql2", ">= 0.4.4"
+  gem "pg", ">= 1.1"
+  gem "sqlite3", ">= 1.4"
+end

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Audited ChangeLog
 
+## 5.1.0 (2022-12-23)
+
+Changed
+
+- config.audit_class takes a string - @simmerz
+  [#609](https://github.com/collectiveidea/audited/pull/609)
+- Filter encrypted attributes automatically - @vlad-psh
+  [#630](https://github.com/collectiveidea/audited/pull/630)
+
+Improved
+
+- README improvements - @jess, @mstroming
+  [#605](https://github.com/collectiveidea/audited/pull/605)
+  [#640](https://github.com/collectiveidea/audited/issues/640)
+- Ignore deadlocks in concurrent audit combinations - @Crammaman
+  [#621](https://github.com/collectiveidea/audited/pull/621)
+- Fix timestamped_migrations deprecation warning - @shouichi
+  [#624](https://github.com/collectiveidea/audited/pull/624)
+- Ensure audits are re-enabled after blocks - @dcorlett
+  [#632](https://github.com/collectiveidea/audited/pull/632)
+- Replace raw string where clause with query methods - @macowie
+  [#642](https://github.com/collectiveidea/audited/pull/642)
+- Test against more Ruby/Rails Versions - @enomotodev, @danielmorrison
+  [#610](https://github.com/collectiveidea/audited/pull/610)
+  [#643](https://github.com/collectiveidea/audited/pull/643)
+
+## 5.0.2 (2021-09-16)
+
+Added
+
+- Relax ActiveRecord version constraint to support Rails 7
+  [#597](https://github.com/collectiveidea/audited/pull/597)
+
+Improved
+
+- Improve loading - @mvastola
+  [#592](https://github.com/collectiveidea/audited/pull/592)
+- Update README - @danirod, @clement1234
+  [#596](https://github.com/collectiveidea/audited/pull/596)
+  [#594](https://github.com/collectiveidea/audited/pull/594)
+
+
 ## 5.0.1 (2021-06-11)
 
 Improved

data/README.md

@@ -1,23 +1,29 @@
-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)
+Audited
+[![Gem Version](https://img.shields.io/gem/v/audited.svg)](http://rubygems.org/gems/audited)
+![Build Status](https://github.com/collectiveidea/audited/actions/workflows/ci.yml/badge.svg)
+[![Code Climate](https://codeclimate.com/github/collectiveidea/audited.svg)](https://codeclimate.com/github/collectiveidea/audited)
 [![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 (5.x) works with Rails 6.1, 6.0, 5.2, 5.1, and 5.0.
+Audited currently (5.x) works with Rails 7.0, 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
 
-Audited supports and is [tested against](http://travis-ci.org/collectiveidea/audited) the following Ruby versions:
+Audited supports and is [tested against](https://github.com/collectiveidea/audited/actions/workflows/ci.yml) the following Ruby versions:
 
-* 2.3.7
-* 2.4.4
-* 2.5.1
-* 2.6.3
+* 2.3 (only tested on Sqlite due to testing issues with other DBs)
+* 2.4
+* 2.5
+* 2.6
+* 2.7
+* 3.0
+* 3.1
 
 Audited may work just fine with a Ruby version not listed above, but we can't guarantee that it will. If you'd like to maintain a Ruby that isn't listed, please let us know with a [pull request](https://github.com/collectiveidea/audited/pulls).
 
@@ -30,7 +36,16 @@ Audited is currently ActiveRecord-only. In a previous life, Audited worked with
 Add the gem to your Gemfile:
 
 ```ruby
-gem "audited", "~> 4.9"
+gem "audited", "~> 5.0"
+```
+
+And if you're using ```require: false``` you must add initializers like this:
+
+```ruby
+#./config/initializers/audited.rb
+require "audited"
+
+Audited::Railtie.initializers.each(&:run)
 ```
 
 Then, from your Rails app directory, create the `audits` table:
@@ -204,7 +219,7 @@ Audited.current_user_method = :authenticated_user
 Outside of a request, Audited can still record the user with the `as_user` method:
 
 ```ruby
-Audited.audit_class.as_user(User.find(1)) do
+Audited.audit_model.as_user(User.find(1)) do
   post.update!(title: "Hello, world!")
 end
 post.audits.last.user # => #<User id: 1>
@@ -231,7 +246,7 @@ end
 `as_user` also accepts a string, which can be useful for auditing updates made in a CLI environment:
 
 ```rb
-Audited.audit_class.as_user("console-user-#{ENV['SSH_USER']}") do
+Audited.audit_model.as_user("console-user-#{ENV['SSH_USER']}") do
   post.update_attributes!(title: "Hello, world!")
 end
 post.audits.last.user # => 'console-user-username'
@@ -271,6 +286,7 @@ class User < ActiveRecord::Base
 end
 
 class Company < ActiveRecord::Base
+  audited
   has_many :users
   has_associated_audits
 end
@@ -298,9 +314,7 @@ If you want to audit only under specific conditions, you can provide conditional
 ```ruby
 class User < ActiveRecord::Base
   audited if: :active?
-
-  private
-
+  
   def active?
     last_login > 6.months.ago
   end
@@ -371,6 +385,17 @@ User.auditing_enabled = false
 end
 ```
 
+### Encrypted attributes
+
+If you're using ActiveRecord's encryption (available from Rails 7) to encrypt some attributes, Audited will automatically filter values of these attributes. No additional configuration is required. Changes to encrypted attributes will be logged as `[FILTERED]`.
+
+```ruby
+class User < ActiveRecord::Base
+  audited
+  encrypts :password
+end
+```
+
 ### Custom `Audit` model
 
 If you want to extend or modify the audit model, create a new class that
@@ -387,7 +412,7 @@ Then set it in an initializer:
 # config/initializers/audited.rb
 
 Audited.config do |config|
-  config.audit_class = CustomAudit
+  config.audit_class = "CustomAudit"
 end
 ```
 

data/gemfiles/rails50.gemfile

@@ -6,5 +6,6 @@ gem "rails", "~> 5.0.0"
 gem "mysql2", ">= 0.3.18", "< 0.6.0"
 gem "pg", ">= 0.18", "< 2.0"
 gem "sqlite3", "~> 1.3.6"
+gem "psych", "~> 3.1"
 
 gemspec name: "audited", path: "../"

data/gemfiles/rails51.gemfile

@@ -6,5 +6,6 @@ gem "rails", "~> 5.1.4"
 gem "mysql2", ">= 0.3.18", "< 0.6.0"
 gem "pg", ">= 0.18", "< 2.0"
 gem "sqlite3", "~> 1.3.6"
+gem "psych", "~> 3.1"
 
 gemspec name: "audited", path: "../"

data/gemfiles/rails52.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", ">= 5.2.0", "< 5.3"
+gem "rails", ">= 5.2.8.1", "< 5.3"
 gem "mysql2", ">= 0.4.4", "< 0.6.0"
 gem "pg", ">= 0.18", "< 2.0"
 gem "sqlite3", "~> 1.3.6"
+gem "psych", "~> 3.1"
 
 gemspec name: "audited", path: "../"

data/gemfiles/rails70.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", ">= 7.0.0", "< 7.1"
+gem "mysql2", ">= 0.4.4"
+gem "pg", ">= 1.1"
+gem "sqlite3", ">= 1.4"
+
+gemspec name: "audited", path: "../"

data/lib/audited/audit.rb

@@ -34,7 +34,7 @@ module Audited
       end
 
       def text_column?
-        Audited.audit_class.columns_hash["audited_changes"].type.to_s == "text"
+        Audited.audit_model.columns_hash["audited_changes"].type.to_s == "text"
       end
     end
   end
@@ -78,14 +78,14 @@ module Audited
     # Returns a hash of the changed attributes with the new values
     def new_attributes
       (audited_changes || {}).each_with_object({}.with_indifferent_access) do |(attr, values), attrs|
-        attrs[attr] = (action == "update" ? values.last : values)
+        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 || {}).each_with_object({}.with_indifferent_access) do |(attr, values), attrs|
-        attrs[attr] = (action == "update" ? values.first : values)
+        attrs[attr] = (action == "update") ? values.first : values
       end
     end
 
@@ -174,7 +174,7 @@ module Audited
       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

@@ -13,7 +13,7 @@ module Audited
   #
   # See <tt>Audited::Auditor::ClassMethods#audited</tt>
   # for configuration options
-  module Auditor #:nodoc:
+  module Auditor # :nodoc:
     extend ActiveSupport::Concern
 
     CALLBACKS = [:audit_create, :audit_update, :audit_destroy]
@@ -79,8 +79,8 @@ module Audited
           before_destroy :require_comment if audited_options[:on].include?(:destroy)
         end
 
-        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
+        has_many :audits, -> { order(version: :asc) }, as: :auditable, class_name: Audited.audit_class, inverse_of: :auditable
+        Audited.audit_model.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)
@@ -97,7 +97,7 @@ module Audited
       end
 
       def has_associated_audits
-        has_many :associated_audits, as: :associated, class_name: Audited.audit_class.name
+        has_many :associated_audits, as: :associated, class_name: Audited.audit_model.name
       end
     end
 
@@ -159,27 +159,28 @@ module Audited
       # Returns nil for versions greater than revisions count
       def revision(version)
         if version == :previous || audits.last.version >= version
-          revision_with Audited.audit_class.reconstruct_attributes(audits_to(version))
+          revision_with Audited.audit_model.reconstruct_attributes(audits_to(version))
         end
       end
 
       # Find the oldest revision recorded prior to the date/time provided.
       def revision_at(date_or_time)
         audits = self.audits.up_until(date_or_time)
-        revision_with Audited.audit_class.reconstruct_attributes(audits) unless audits.empty?
+        revision_with Audited.audit_model.reconstruct_attributes(audits) unless audits.empty?
       end
 
       # List of attributes that are audited.
       def audited_attributes
         audited_attributes = attributes.except(*self.class.non_audited_columns)
+        audited_attributes = redact_values(audited_attributes)
+        audited_attributes = filter_encrypted_attrs(audited_attributes)
         normalize_enum_changes(audited_attributes)
       end
 
       # 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.base_class.name, id: id)
+        Audited.audit_model.unscoped.where(auditable: self)
+          .or(Audited.audit_model.unscoped.where(associated: self))
           .order(created_at: :desc)
       end
 
@@ -190,8 +191,13 @@ module Audited
         combine_target.comment = "#{combine_target.comment}\nThis audit is the result of multiple audits being combined."
 
         transaction do
-          combine_target.save!
-          audits_to_combine.unscope(:limit).where("version < ?", combine_target.version).delete_all
+          begin
+            combine_target.save!
+            audits_to_combine.unscope(:limit).where("version < ?", combine_target.version).delete_all
+          rescue ActiveRecord::Deadlocked
+            # Ignore Deadlocks, if the same record is getting its old audits combined more than once at the same time then
+            # both combining operations will be the same. Ignoring this error allows one of the combines to go through successfully.
+          end
         end
       end
 
@@ -206,7 +212,7 @@ module Audited
           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)
+          Audited.audit_model.assign_revision_attributes(revision, attributes)
 
           # Remove any association proxies so that they will be recreated
           # and reference the correct object for this revision. The only way
@@ -234,6 +240,7 @@ module Audited
           end
 
         filtered_changes = redact_values(filtered_changes)
+        filtered_changes = filter_encrypted_attrs(filtered_changes)
         filtered_changes = normalize_enum_changes(filtered_changes)
         filtered_changes.to_hash
       end
@@ -257,19 +264,36 @@ module Audited
       end
 
       def redact_values(filtered_changes)
-        [audited_options[:redacted]].flatten.compact.each do |option|
-          changes = filtered_changes[option.to_s]
-          new_value = audited_options[:redaction_value] || REDACTED
-          values = if changes.is_a? Array
-            changes.map { new_value }
-          else
-            new_value
-          end
-          hash = {option.to_s => values}
-          filtered_changes.merge!(hash)
+        filter_attr_values(
+          audited_changes: filtered_changes,
+          attrs: Array(audited_options[:redacted]).map(&:to_s),
+          placeholder: audited_options[:redaction_value] || REDACTED
+        )
+      end
+
+      def filter_encrypted_attrs(filtered_changes)
+        filter_attr_values(
+          audited_changes: filtered_changes,
+          attrs: respond_to?(:encrypted_attributes) ? Array(encrypted_attributes).map(&:to_s) : []
+        )
+      end
+
+      # Replace values for given attrs to a placeholder and return modified hash
+      #
+      # @param audited_changes [Hash] Hash of changes to be saved to audited version record
+      # @param attrs [Array<String>] Array of attrs, values of which will be replaced to placeholder value
+      # @param placeholder [String] Placeholder to replace original attr values
+      def filter_attr_values(audited_changes: {}, attrs: [], placeholder: "[FILTERED]")
+        attrs.each do |attr|
+          next unless audited_changes.key?(attr)
+
+          changes = audited_changes[attr]
+          values = changes.is_a?(Array) ? changes.map { placeholder } : placeholder
+
+          audited_changes[attr] = values
         end
 
-        filtered_changes
+        audited_changes
       end
 
       def rails_below?(rails_version)
@@ -290,20 +314,20 @@ module Audited
 
       def audit_create
         write_audit(action: "create", audited_changes: audited_attributes,
-                    comment: audit_comment)
+          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,
-                      comment: audit_comment)
+            comment: audit_comment)
         end
       end
 
       def audit_destroy
         unless new_record?
           write_audit(action: "destroy", audited_changes: audited_attributes,
-                      comment: audit_comment)
+            comment: audit_comment)
         end
       end
 
@@ -397,7 +421,7 @@ module Audited
       #   end
       #
       def without_auditing
-        auditing_was_enabled = auditing_enabled
+        auditing_was_enabled = class_auditing_enabled
         disable_auditing
         yield
       ensure
@@ -411,7 +435,7 @@ module Audited
       #   end
       #
       def with_auditing
-        auditing_was_enabled = auditing_enabled
+        auditing_was_enabled = class_auditing_enabled
         enable_auditing
         yield
       ensure
@@ -431,11 +455,11 @@ module Audited
       # convenience wrapper around
       # @see Audit#as_user.
       def audit_as(user, &block)
-        Audited.audit_class.as_user(user, &block)
+        Audited.audit_model.as_user(user, &block)
       end
 
       def auditing_enabled
-        Audited.store.fetch("#{table_name}_auditing_enabled", true) && Audited.auditing_enabled
+        class_auditing_enabled && Audited.auditing_enabled
       end
 
       def auditing_enabled=(val)
@@ -466,6 +490,10 @@ module Audited
           default_ignored_attributes
         end
       end
+
+      def class_auditing_enabled
+        Audited.store.fetch("#{table_name}_auditing_enabled", true)
+      end
     end
   end
 end

data/lib/audited/rspec_matchers.rb

@@ -221,7 +221,7 @@ module Audited
       def association_exists?
         !reflection.nil? &&
           reflection.macro == :has_many &&
-          reflection.options[:class_name] == Audited.audit_class.name
+          reflection.options[:class_name] == Audited.audit_model.name
       end
     end
   end

data/lib/audited/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Audited
-  VERSION = "5.0.1"
+  VERSION = "5.1.0"
 end

data/lib/audited.rb

@@ -13,7 +13,11 @@ module Audited
     attr_writer :audit_class
 
     def audit_class
-      @audit_class ||= Audit
+      @audit_class ||= "Audited::Audit"
+    end
+
+    def audit_model
+      audit_class.constantize
     end
 
     def store
@@ -39,9 +43,9 @@ module Audited
 end
 
 require "audited/auditor"
-require "audited/audit"
 
 ActiveSupport.on_load :active_record do
+  require "audited/audit"
   include Audited::Auditor
 end
 

data/lib/generators/audited/migration.rb

@@ -4,14 +4,22 @@ module Audited
   module Generators
     module Migration
       # Implement the required interface for Rails::Generators::Migration.
-      def next_migration_number(dirname) #:nodoc:
+      def next_migration_number(dirname) # :nodoc:
         next_migration_number = current_migration_number(dirname) + 1
-        if ::ActiveRecord::Base.timestamped_migrations
+        if timestamped_migrations?
           [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
         else
           "%.3d" % next_migration_number
         end
       end
+
+      private
+
+      def timestamped_migrations?
+        (Rails.version >= "7.0") ?
+          ::ActiveRecord.timestamped_migrations :
+          ::ActiveRecord::Base.timestamped_migrations
+      end
     end
   end
 end

data/spec/audited/audit_spec.rb

@@ -37,7 +37,7 @@ describe Audited::Audit do
 
     context "when a custom audit class is configured" do
       it "should be used in place of #{described_class}" do
-        Audited.config { |config| config.audit_class = CustomAudit }
+        Audited.config { |config| config.audit_class = "CustomAudit" }
         TempModel1.audited
 
         record = TempModel1.create
@@ -62,7 +62,7 @@ describe Audited::Audit do
   end
 
   describe "#audited_changes" do
-    let(:audit) { Audited.audit_class.new }
+    let(:audit) { Audited.audit_model.new }
 
     it "can unserialize yaml from text columns" do
       audit.audited_changes = {foo: "bar"}

data/spec/audited/auditor_spec.rb

@@ -234,6 +234,14 @@ describe Audited::Auditor do
       expect(user.audits.last.audited_changes["password"]).to eq(["My", "Custom", "Value", 7])
     end
 
+    if ::ActiveRecord::VERSION::MAJOR >= 7
+      it "should filter encrypted attributes" do
+        user = Models::ActiveRecord::UserWithEncryptedPassword.create(password: "password")
+        user.save
+        expect(user.audits.last.audited_changes["password"]).to eq("[FILTERED]")
+      end
+    end
+
     if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
       describe "'json' and 'jsonb' audited_changes column type" do
         let(:migrations_path) { SPEC_ROOT.join("support/active_record/postgres") }
@@ -272,11 +280,11 @@ describe Audited::Auditor do
       yesterday = 1.day.ago
 
       u = Models::ActiveRecord::NoAttributeProtectionUser.new(name: "name",
-                                                              username: "username",
-                                                              password: "password",
-                                                              activated: true,
-                                                              suspended_at: yesterday,
-                                                              logins: 2)
+        username: "username",
+        password: "password",
+        activated: true,
+        suspended_at: yesterday,
+        logins: 2)
 
       expect(u.name).to eq("name")
       expect(u.username).to eq("username")
@@ -814,6 +822,15 @@ describe Audited::Auditor do
       }.to_not change(Audited::Audit, :count)
     end
 
+    context "when global audits are disabled" do
+      it "should re-enable class audits after #without_auditing block" do
+        Audited.auditing_enabled = false
+        Models::ActiveRecord::User.without_auditing {}
+        Audited.auditing_enabled = true
+        expect(Models::ActiveRecord::User.auditing_enabled).to eql(true)
+      end
+    end
+
     it "should reset auditing status even it raises an exception" do
       begin
         Models::ActiveRecord::User.without_auditing { raise }
@@ -884,6 +901,15 @@ describe Audited::Auditor do
       }.to change(Audited::Audit, :count).by(1)
     end
 
+    context "when global audits are disabled" do
+      it "should re-enable class audits after #with_auditing block" do
+        Audited.auditing_enabled = false
+        Models::ActiveRecord::User.with_auditing {}
+        Audited.auditing_enabled = true
+        expect(Models::ActiveRecord::User.auditing_enabled).to eql(true)
+      end
+    end
+
     it "should reset auditing status even it raises an exception" do
       Models::ActiveRecord::User.disable_auditing
       begin

data/spec/rails_app/config/application.rb

@@ -4,6 +4,12 @@ module RailsApp
   class Application < Rails::Application
     config.root = File.expand_path("../../", __FILE__)
     config.i18n.enforce_available_locales = true
+
+    if !Rails.version.start_with?("5.0") && !Rails.version.start_with?("5.1") && config.active_record.respond_to?(:yaml_column_permitted_classes=)
+      config.active_record.yaml_column_permitted_classes =
+        %w[String Symbol Integer NilClass Float Time Date FalseClass Hash Array DateTime TrueClass BigDecimal
+          ActiveSupport::TimeWithZone ActiveSupport::TimeZone ActiveSupport::HashWithIndifferentAccess]
+    end
   end
 end
 

data/spec/rails_app/config/database.yml

@@ -9,7 +9,8 @@ sqlite3: &SQLITE
 postgresql: &POSTGRES
   adapter: postgresql
   username: postgres
-  password:
+  password: postgres
+  host: localhost
   database: audited_test
   min_messages: ERROR
 
@@ -17,7 +18,7 @@ mysql: &MYSQL
   adapter: mysql2
   host: localhost
   username: root
-  password:
+  password: root
   database: audited_test
   charset: utf8
 

data/spec/rails_app/config/environments/test.rb

@@ -44,4 +44,9 @@ RailsApp::Application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  if ::ActiveRecord::VERSION::MAJOR >= 7
+    config.active_record.encryption.key_derivation_salt = SecureRandom.hex
+    config.active_record.encryption.primary_key = SecureRandom.hex
+  end
 end

data/spec/support/active_record/models.rb

@@ -41,6 +41,14 @@ module Models
       audited redacted: :password, redaction_value: ["My", "Custom", "Value", 7]
     end
 
+    if ::ActiveRecord::VERSION::MAJOR >= 7
+      class UserWithEncryptedPassword < ::ActiveRecord::Base
+        self.table_name = :users
+        audited
+        encrypts :password
+      end
+    end
+
     class CommentRequiredUser < ::ActiveRecord::Base
       self.table_name = :users
       audited except: :password, comment_required: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,7 +24,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +115,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -165,9 +165,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".standard.yml"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
@@ -180,6 +180,7 @@ files:
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/audited-rspec.rb
 - lib/audited.rb
 - lib/audited/audit.rb
@@ -250,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Log all changes to your models

data/.travis.yml

@@ -1,67 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.3.8
-  - 2.4.10
-  - 2.5.9
-  - 2.6.7
-  - 2.7.3
-  - 3.0.1
-  - ruby-head
-env:
-  - DB=SQLITE
-  - DB=POSTGRES
-  - DB=MYSQL
-addons:
-  postgresql: "9.4"
-services:
-  - mysql
-before_install:
-  # https://github.com/travis-ci/travis-ci/issues/8978
-  - "travis_retry gem update --system"
-gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-  - gemfiles/rails52.gemfile
-  - gemfiles/rails60.gemfile
-  - gemfiles/rails61.gemfile
-matrix:
-  include:
-    - rvm: 2.6.7
-      script: bundle exec standardrb
-      env: DB=standard # make travis build display nicer
-  exclude:
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails61.gemfile
-    - rvm: 2.4.10
-      gemfile: gemfiles/rails61.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails60.gemfile
-    - rvm: 2.4.10
-      gemfile: gemfiles/rails60.gemfile
-    - 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:
-    - rvm: ruby-head
-  fast_finish: true
-branches:
-  only:
-  - master
-  - /.*-stable$/
-notifications:
-  webhooks:
-    urls:
-    - https://buildlight.collectiveidea.com/
-    on_start: always