audited 5.3.3 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1979018213d9b4793bf6c450161759ad6e2ee8c0749c21c9c361bb012b703016
-  data.tar.gz: 113875c36e93998ef49e54e1ee65812996a28d553f5fd17c9a6252ea046f2cbc
+  metadata.gz: 8064f489d5ebd438af237683541fb2436fc687d786a688f5d6ce936e24e6d89b
+  data.tar.gz: b6acaf26b868f64883dcd9af556cfc5233be1395c3fc03fdea13c3c7449de6b8
 SHA512:
-  metadata.gz: 9d490c64b590cc9df55d67551908bd450c2737f04d55201000c637122682aaf6c1df069cc61894774c1778ddb29488e0f6e22d5786f155f6415cb47c12fc45f5
-  data.tar.gz: 7801bb4dadea8bef4499f50115749cf589f59ffc795c950dbfdf918989311ec6a1380237ef0bbd05f1c1c9edcfe9c42ff5d66d3e44fb71666127fe57dfbcaaee
+  metadata.gz: 9466b4f7ab9a100e9ff0e9e5dbec591dc30e9027d8529c481f3e3faa72cb6d89c2cf5eb6c19e1cbbb6ceba5ea2f55a882e7c4fe2ef587a6eed676640d63372ff
+  data.tar.gz: 5f9050ffcff6dcadd3e4040aa941f2f48773ef575e69f2012d4088e9fed327ec35e3a386c7437bbe019cbfc2c32e0e4ac348f49977915ffac6c6e1b1d8580c6c

data/.github/workflows/ci.yml

@@ -18,6 +18,7 @@ jobs:
           - rails60
           - rails61
           - rails70
+          - rails71
         db: [POSTGRES, MYSQL, SQLITE]
         exclude:
           # MySQL has issues on Ruby 2.3
@@ -96,6 +97,16 @@ jobs:
           - appraisal: rails70
             ruby: 2.6
 
+          # Rails 7.1 supports Ruby 2.7+
+          - appraisal: rails71
+            ruby: 2.3
+          - appraisal: rails71
+            ruby: 2.4
+          - appraisal: rails71
+            ruby: 2.5
+          - appraisal: rails71
+            ruby: 2.6
+
     services:
       postgres:
         image: postgres

data/Appraisals

@@ -7,6 +7,7 @@ appraise "rails50" do
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
   gem "psych", "~> 3.1"
+  gem "loofah", "2.20.0"
 end
 
 appraise "rails51" do
@@ -15,6 +16,7 @@ appraise "rails51" do
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
   gem "psych", "~> 3.1"
+  gem "loofah", "2.20.0"
 end
 
 appraise "rails52" do
@@ -23,6 +25,7 @@ appraise "rails52" do
   gem "pg", ">= 0.18", "< 2.0"
   gem "sqlite3", "~> 1.3.6"
   gem "psych", "~> 3.1"
+  gem "loofah", "2.20.0"
 end
 
 appraise "rails60" do
@@ -45,3 +48,10 @@ appraise "rails70" do
   gem "pg", ">= 1.1"
   gem "sqlite3", ">= 1.4"
 end
+
+appraise "rails71" do
+  gem "rails", ">= 7.1.0.beta1", "< 7.2"
+  gem "mysql2", ">= 0.4.4"
+  gem "pg", ">= 1.1"
+  gem "sqlite3", ">= 1.4"
+end

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Audited ChangeLog
 
+## 5.4.1 (2023-09-30)
+
+- Replace RequestStore with ActiveSupport::CurrentAttributes - @the-spectator
+  [#673](https://github.com/collectiveidea/audited/pull/673/)
+- Don't require railtie when used outside of Rails - @nicduke38degrees
+  [#665](https://github.com/collectiveidea/audited/pull/665)
+
+## 5.4.0 (2023-09-30)
+
+- Add Rails 7.1 support - @yuki24
+  [#686](https://github.com/collectiveidea/audited/pull/686)
+
 ## 5.3.3 (2023-03-24)
 
 - Use RequestStore instead of Thread.current for thread-safe requests - @tiagocassio

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.x) works with Rails 7.0, 6.1, 6.0, 5.2, 5.1, and 5.0.
+Audited currently (5.x) works with Rails 7.1, 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).

data/gemfiles/rails50.gemfile

@@ -7,5 +7,6 @@ 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"
 
 gemspec name: "audited", path: "../"

data/gemfiles/rails51.gemfile

@@ -7,5 +7,6 @@ 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"
 
 gemspec name: "audited", path: "../"

data/gemfiles/rails52.gemfile

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

data/gemfiles/rails71.gemfile

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

data/lib/audited/audit.rb

@@ -49,7 +49,11 @@ module Audited
     cattr_accessor :audited_class_names
     self.audited_class_names = Set.new
 
-    serialize :audited_changes, YAMLIfTextColumnType
+    if Rails.version >= "7.1"
+      serialize :audited_changes, coder: YAMLIfTextColumnType
+    else
+      serialize :audited_changes, YAMLIfTextColumnType
+    end
 
     scope :ascending, -> { reorder(version: :asc) }
     scope :descending, -> { reorder(version: :desc) }

data/lib/audited/request_store.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "active_support"
+
+module Audited
+  class RequestStore < ActiveSupport::CurrentAttributes
+    attribute :audited_store
+  end
+end

data/lib/audited/version.rb

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

data/lib/audited.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_record"
-require "request_store"
 
 module Audited
   class << self
@@ -22,10 +21,11 @@ module Audited
 
     # remove audit_model in next major version it was only shortly present in 5.1.0
     alias_method :audit_model, :audit_class
-    deprecate audit_model: "use Audited.audit_class instead of Audited.audit_model. This method will be removed."
+    deprecate audit_model: "use Audited.audit_class instead of Audited.audit_model. This method will be removed.",
+              deprecator: ActiveSupport::Deprecation.new('6.0.0', 'Audited')
 
     def store
-      RequestStore.store[:audited_store] ||= {}
+      Audited::RequestStore.audited_store ||= {}
     end
 
     def config
@@ -41,6 +41,7 @@ module Audited
 end
 
 require "audited/auditor"
+require "audited/request_store"
 
 ActiveSupport.on_load :active_record do
   require "audited/audit"
@@ -48,4 +49,4 @@ ActiveSupport.on_load :active_record do
 end
 
 require "audited/sweeper"
-require "audited/railtie"
+require "audited/railtie" if Audited.const_defined?(:Rails)

data/spec/audited/audit_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-SingleCov.covered! uncovered: 1 # Rails version check
+SingleCov.covered! uncovered: 2 # Rails version check
 
 class CustomAudit < Audited::Audit
   def custom_method

data/spec/audited_spec.rb

@@ -3,12 +3,16 @@ require "spec_helper"
 describe Audited do
   describe "#store" do
     describe "maintains state of store" do
-      let(:current_user) { RequestStore.store[:audited_store] }
+      let(:current_user) { Audited::RequestStore.audited_store }
       before { Audited.store[:current_user] = current_user }
 
       it "checks store is not nil" do
         expect(Audited.store[:current_user]).to eq(current_user)
       end
+
+      it "when executed with Fibers" do
+        Fiber.new { expect(Audited.store[:current_user]).to eq(current_user) }.resume
+      end
     end
   end
 end

data/spec/rails_app/config/application.rb

@@ -5,11 +5,34 @@ module RailsApp
     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=)
+    if Rails.version.start_with?("7.1") && config.active_record.respond_to?(:yaml_column_permitted_classes=)
+      config.active_record.yaml_column_permitted_classes = [
+        String,
+        Symbol,
+        Integer,
+        NilClass,
+        Float,
+        Time,
+        Date,
+        FalseClass,
+        Hash,
+        Array,
+        DateTime,
+        TrueClass,
+        BigDecimal,
+        ActiveSupport::TimeWithZone,
+        ActiveSupport::TimeZone,
+        ActiveSupport::HashWithIndifferentAccess
+      ]
+    elsif !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
+
+    if Rails.version >= "7.1"
+      config.active_support.cache_format_version = 7.1
+    end
   end
 end
 

data/spec/support/active_record/models.rb

@@ -8,7 +8,12 @@ module Models
       attribute :non_column_attr if Rails.version >= "5.1"
       attr_protected :logins if respond_to?(:attr_protected)
       enum status: {active: 0, reliable: 1, banned: 2}
-      serialize :phone_numbers, Array
+
+      if Rails.version >= "7.1"
+        serialize :phone_numbers, type: Array
+      else
+        serialize :phone_numbers, Array
+      end
 
       def name=(val)
         write_attribute(:name, CGI.escapeHTML(val))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 5.4.1
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-24 00:00:00.000000000 Z
+date: 2023-11-06 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: '7.1'
+        version: '7.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,21 +34,27 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.7'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '7.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '7.7'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +78,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -82,7 +88,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -196,11 +202,13 @@ files:
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
 - lib/audited-rspec.rb
 - lib/audited.rb
 - lib/audited/audit.rb
 - lib/audited/auditor.rb
 - lib/audited/railtie.rb
+- lib/audited/request_store.rb
 - lib/audited/rspec_matchers.rb
 - lib/audited/sweeper.rb
 - lib/audited/version.rb