audited 5.6.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f68b2608cf53ed7087873504b4f29c97599bf31a79d284a3675c1725c91bfba
-  data.tar.gz: 62a32603313de542d0e9aa261110d0be63ba50c56e3073bd828e8492681ec7cf
+  metadata.gz: e0bfd7a5ca6d490f0462b5605cca4406ee60edbc1684953a3262f1395662b1a4
+  data.tar.gz: 4bf6e8845875c22900eb94d9dc0cfd73ddb0f065e379b59648bbd1555f3a0db8
 SHA512:
-  metadata.gz: de9505c3076a24b043ba3128f526709def0c4c9dbe2a6ac56dab7163b252efa20e94c84f9481fb7c3e5673eee822e18654949736693e42e4e00285149cc639f0
-  data.tar.gz: 88d44336e6e2e61952a973d9b44957d68375cc18e009ac0fc410638b9748dcd4a331dcb15224f073e28077c84ee0f50c8d5e848f559925ebedca77696ca35f32
+  metadata.gz: ce188b4c71689ef96dce51e1affb292dc5f98c8fee625241e6d929ed361887bfa4643c975ac7ce031eddff2956dcfbc5bf4e630f58fa9f5a4bb46e6f06d05d9e
+  data.tar.gz: 305b28ac6501b9bc159fdab34fbd013202e797669072721ce7cb765ad7f7a779ae9893e3ad1eab634d6a7be785c658c4a7b7e8ee1baceb48683ad6a1e1f67b78

data/Appraisals

@@ -1,26 +1,8 @@
 # Include DB adapters matching the version requirements in
 # rails/activerecord/lib/active_record/connection_adapters/*adapter.rb
 
-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"
-  gem "psych", "~> 3.1"
-  gem "loofah", "2.20.0"
-end
-
-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"
-  gem "psych", "~> 3.1"
-  gem "loofah", "2.20.0"
-end
-
 appraise "rails52" do
-  gem "rails", ">= 5.2.8.1", "< 5.3"
+  gem "rails", "~> 5.2.8"
   gem "mysql2", ">= 0.4.4", "< 0.6.0"
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
@@ -29,29 +11,50 @@ appraise "rails52" do
 end
 
 appraise "rails60" do
-  gem "rails", ">= 6.0.0", "< 6.1"
+  gem "rails", "~> 6.0.6"
   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"
+  gem "rails", "~> 6.1.7"
   gem "mysql2", ">= 0.4.4"
   gem "pg", ">= 1.1", "< 2.0"
   gem "sqlite3", "~> 1.4"
 end
 
 appraise "rails70" do
-  gem "rails", ">= 7.0.0", "< 7.1"
+  gem "rails", "~> 7.0.8"
   gem "mysql2", ">= 0.4.4"
   gem "pg", ">= 1.1"
-  gem "sqlite3", ">= 1.4"
+  gem "sqlite3", "~> 1.4"
 end
 
 appraise "rails71" do
-  gem "rails", ">= 7.1.0.beta1", "< 7.2"
+  gem "rails", "~> 7.1.3"
   gem "mysql2", ">= 0.4.4"
   gem "pg", ">= 1.1"
+  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails72" do
+  gem "rails", "~> 7.2.0"
+  gem "mysql2", "~> 0.5"
+  gem "pg", "~> 1.1"
   gem "sqlite3", ">= 1.4"
 end
+
+appraise "rails80" do
+  gem "rails", "~> 8.0.0"
+  gem "mysql2", "~> 0.5"
+  gem "pg", "~> 1.1"
+  gem "sqlite3", ">= 1.4"
+end
+
+appraise "rails_main" do
+  gem "rails", github: "rails/rails", branch: "main"
+  gem "mysql2", "~> 0.5"
+  gem "pg", "~> 1.1"
+  gem "sqlite3", ">= 2.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Audited ChangeLog
 
+### 5.8.0 (2024-11-08)
+- Allow calling audited multiple times - @mohammednasser-32
+  [734](https://github.com/collectiveidea/audited/pull/734)  
+- Relax gemspec to allow Rails 8.1 - @BranLiang
+  [738](https://github.com/collectiveidea/audited/pull/738)
+
+### 5.7.0 (2024-08-13)
+
+- Support for Rails 7.2 and Ruby 3.3, and testing cleanups - @mattbrictson
+  [#723](https://github.com/collectiveidea/audited/pull/723)
+- Allow max_audits to be a proc or symbol - @gmhawash
+  [#718](https://github.com/collectiveidea/audited/pull/718)
+- Support Rails 8 - @fernandomenolli
+  [#717](https://github.com/collectiveidea/audited/pull/717)
+
+
 ### 5.6.0 (2024-04-05)
 
 - Removed support for Rails 5.0 and 5.1.
@@ -38,7 +54,7 @@
 ## 5.3.3 (2023-03-24)
 
 - Use RequestStore instead of Thread.current for thread-safe requests - @tiagocassio
-  [#669](https://github.com/collectiveidea/audited/pull/669)
+  [#669](https://github.com/c ollectiveidea/audited/pull/669)
 - Clean up Touch audits - @mcyoung, @akostadinov
   [#668](https://github.com/collectiveidea/audited/pull/668)
 

data/README.md

@@ -8,7 +8,7 @@ Audited
 **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.6) works with Rails 7.1, 7.0, 6.1, 6.0, 5.2.
+Audited currently (5.6) works with Rails 7.2, 7.1, 7.0, 6.1, 6.0, 5.2.
 
 For Rails 5.0 & 5.1, use gem version 5.4.3
 For Rails 4, use gem version 4.x
@@ -26,6 +26,7 @@ Audited supports and is [tested against](https://github.com/collectiveidea/audit
 * 3.0
 * 3.1
 * 3.2
+* 3.3
 
 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).
 

data/audited.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3.0"
 
-  gem.add_dependency "activerecord", ">= 5.2", "< 7.2"
-  gem.add_dependency "activesupport", ">= 5.2", "< 7.2"
+  gem.add_dependency "activerecord", ">= 5.2", "< 8.2"
+  gem.add_dependency "activesupport", ">= 5.2", "< 8.2"
 
   gem.add_development_dependency "appraisal"
-  gem.add_development_dependency "rails", ">= 5.2", "< 7.2"
+  gem.add_development_dependency "rails", ">= 5.2", "< 8.2"
   gem.add_development_dependency "rspec-rails"
   gem.add_development_dependency "standard"
   gem.add_development_dependency "single_cov"

data/lib/audited/auditor.rb

@@ -59,9 +59,16 @@ module Audited
       #     end
       #
       def audited(options = {})
-        # don't allow multiple calls
-        return if included_modules.include?(Audited::Auditor::AuditedInstanceMethods)
+        audited? ? update_audited_options(options) : set_audit(options)
+      end
+
+      private
 
+      def audited?
+        included_modules.include?(Audited::Auditor::AuditedInstanceMethods)
+      end
+
+      def set_audit(options)
         extend Audited::Auditor::AuditedClassMethods
         include Audited::Auditor::AuditedInstanceMethods
 
@@ -69,10 +76,7 @@ module Audited
         class_attribute :audited_options, instance_writer: false
         attr_accessor :audit_version, :audit_comment
 
-        self.audited_options = options
-        normalize_audited_options
-
-        self.audit_associated_with = audited_options[:associated_with]
+        set_audited_options(options)
 
         if audited_options[:comment_required]
           validate :presence_of_audit_comment
@@ -100,6 +104,18 @@ module Audited
       def has_associated_audits
         has_many :associated_audits, as: :associated, class_name: Audited.audit_class.name
       end
+
+      def update_audited_options(new_options)
+        previous_audit_options = self.audited_options
+        set_audited_options(new_options)
+        self.reset_audited_columns
+      end
+
+      def set_audited_options(options)
+        self.audited_options = options
+        normalize_audited_options
+        self.audit_associated_with = audited_options[:associated_with]
+      end
     end
 
     module AuditedInstanceMethods
@@ -384,13 +400,25 @@ module Audited
       end
 
       def combine_audits_if_needed
-        max_audits = audited_options[:max_audits]
+        max_audits = evaluate_max_audits
+
         if max_audits && (extra_count = audits.count - max_audits) > 0
           audits_to_combine = audits.limit(extra_count + 1)
           combine_audits(audits_to_combine)
         end
       end
 
+      def evaluate_max_audits
+        max_audits = case (option = audited_options[:max_audits])
+        when Proc then option.call
+        when Symbol then send(option)
+        else
+          option
+        end
+
+        Integer(max_audits).abs if max_audits
+      end
+
       def require_comment
         if auditing_enabled && audit_comment.blank?
           errors.add(:audit_comment, :blank)
@@ -502,8 +530,7 @@ module Audited
         audited_options[:on] = ([:create, :update, :touch, :destroy] - Audited.ignored_default_callbacks) if audited_options[:on].empty?
         audited_options[:only] = Array.wrap(audited_options[:only]).map(&:to_s)
         audited_options[:except] = Array.wrap(audited_options[:except]).map(&:to_s)
-        max_audits = audited_options[:max_audits] || Audited.max_audits
-        audited_options[:max_audits] = Integer(max_audits).abs if max_audits
+        audited_options[:max_audits] ||= Audited.max_audits
       end
 
       def calculate_non_audited_columns
@@ -519,6 +546,11 @@ module Audited
       def class_auditing_enabled
         Audited.store.fetch("#{table_name}_auditing_enabled", true)
       end
+
+      def reset_audited_columns
+        @audited_columns = nil
+        @non_audited_columns = nil
+      end
     end
   end
 end

data/lib/audited/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,7 +24,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Log all changes to your models