audited 5.4.3 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e366c7864b72cc3729bd15673e391ff3f45fee1b6ab0f2789ed8499588002f
-  data.tar.gz: 6a3f24da58730f880eaa1e7e607f33ef5bf74a035b477249e7d34f827e36728c
+  metadata.gz: 6f68b2608cf53ed7087873504b4f29c97599bf31a79d284a3675c1725c91bfba
+  data.tar.gz: 62a32603313de542d0e9aa261110d0be63ba50c56e3073bd828e8492681ec7cf
 SHA512:
-  metadata.gz: fb1332090ad6d301af3d61a2948b8376f33dad8bea9c431ad480432f3c8d80837b9202f718e69be2dcdb0bb7bab8a329d77ae45e2fc50c533b6c79979e5d2b49
-  data.tar.gz: 632aae39c6307342b8430308f2f093e03a1b172f8ce0c08a3ed87f380f48b39e5fff63b2132fa93f9a5d0dec4a08b391671f52b5d2173a680c951aa27b4537f9
+  metadata.gz: de9505c3076a24b043ba3128f526709def0c4c9dbe2a6ac56dab7163b252efa20e94c84f9481fb7c3e5673eee822e18654949736693e42e4e00285149cc639f0
+  data.tar.gz: 88d44336e6e2e61952a973d9b44957d68375cc18e009ac0fc410638b9748dcd4a331dcb15224f073e28077c84ee0f50c8d5e848f559925ebedca77696ca35f32

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Audited ChangeLog
 
+### 5.6.0 (2024-04-05)
+
+- Removed support for Rails 5.0 and 5.1.
+- Replace RequestStore with ActiveSupport::CurrentAttributes - @punkisdead
+  [#702](https://github.com/collectiveidea/audited/pull/702)
+
+### 5.5.0 (2024-04-02)
+
+- Bad release. Same code as 5.4.1. Use 5.6.0 for updated features.
+
 ### 5.4.3 (2024-01-11)
 
 - Ignore readonly columns in audit - @sriddbs

data/README.md

@@ -8,8 +8,9 @@ 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.1, 7.0, 6.1, 6.0, 5.2, 5.1, and 5.0.
+Audited currently (5.6) works with Rails 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
 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/audited.gemspec

@@ -0,0 +1,38 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "audited/version"
+
+Gem::Specification.new do |gem|
+  gem.name = "audited"
+  gem.version = Audited::VERSION
+
+  gem.authors = ["Brandon Keepers", "Kenneth Kalmer", "Daniel Morrison", "Brian Ryckbost", "Steve Richert", "Ryan Glover"]
+  gem.email = "info@collectiveidea.com"
+  gem.description = "Log all changes to your models"
+  gem.summary = gem.description
+  gem.homepage = "https://github.com/collectiveidea/audited"
+  gem.license = "MIT"
+
+  gem.files = `git ls-files`.split($\).reject { |f| f =~ /^(\.gemspec|\.git|\.standard|\.yard|gemfiles|test|spec)/ }
+
+  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_development_dependency "appraisal"
+  gem.add_development_dependency "rails", ">= 5.2", "< 7.2"
+  gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency "standard"
+  gem.add_development_dependency "single_cov"
+
+  # JRuby support for the test ENV
+  if defined?(JRUBY_VERSION)
+    gem.add_development_dependency "activerecord-jdbcsqlite3-adapter", "~> 1.3"
+    gem.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 1.3"
+    gem.add_development_dependency "activerecord-jdbcmysql-adapter", "~> 1.3"
+  else
+    gem.add_development_dependency "sqlite3", ">= 1.3.6"
+    gem.add_development_dependency "mysql2", ">= 0.3.20"
+    gem.add_development_dependency "pg", ">= 0.18", "< 2.0"
+  end
+end

data/lib/audited/auditor.rb

@@ -249,6 +249,8 @@ module Audited
             all_changes.except(*self.class.non_audited_columns)
           end
 
+        filtered_changes = normalize_enum_changes(filtered_changes)
+
         if for_touch && (last_audit = audits.last&.audited_changes)
           filtered_changes.reject! do |k, v|
             last_audit[k].to_json == v.to_json ||
@@ -258,7 +260,6 @@ module Audited
 
         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
 

data/lib/audited/version.rb

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

data/lib/audited.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 require "active_record"
-require "request_store"
 
 module Audited
+  # Wrapper around ActiveSupport::CurrentAttributes
+  class RequestStore < ActiveSupport::CurrentAttributes
+    attribute :audited_store
+  end
+
   class << self
     attr_accessor \
       :auditing_enabled,
@@ -27,7 +31,7 @@ module Audited
               deprecator: ActiveSupport::Deprecation.new('6.0.0', 'Audited')
 
     def store
-      RequestStore.store[:audited_store] ||= {}
+      RequestStore.audited_store ||= {}
     end
 
     def config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 5.6.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -31,24 +31,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -69,7 +75,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -79,7 +85,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -179,25 +185,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/buildlight.yml"
-- ".github/workflows/ci.yml"
-- ".github/workflows/publish_gem.yml"
-- ".gitignore"
-- ".standard.yml"
-- ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
-- gemfiles/rails52.gemfile
-- gemfiles/rails60.gemfile
-- gemfiles/rails61.gemfile
-- gemfiles/rails70.gemfile
-- gemfiles/rails71.gemfile
+- audited.gemspec
 - lib/audited-rspec.rb
 - lib/audited.rb
 - lib/audited/audit.rb
@@ -220,35 +214,6 @@ files:
 - lib/generators/audited/templates/rename_parent_to_association.rb
 - lib/generators/audited/templates/revert_polymorphic_indexes_order.rb
 - lib/generators/audited/upgrade_generator.rb
-- spec/audited/audit_spec.rb
-- spec/audited/auditor_spec.rb
-- spec/audited/rspec_matchers_spec.rb
-- spec/audited/sweeper_spec.rb
-- spec/audited_spec.rb
-- spec/audited_spec_helpers.rb
-- spec/rails_app/app/assets/config/manifest.js
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/routes.rb
-- spec/spec_helper.rb
-- spec/support/active_record/models.rb
-- spec/support/active_record/postgres/1_change_audited_changes_type_to_json.rb
-- spec/support/active_record/postgres/2_change_audited_changes_type_to_jsonb.rb
-- spec/support/active_record/schema.rb
-- test/db/version_1.rb
-- test/db/version_2.rb
-- test/db/version_3.rb
-- test/db/version_4.rb
-- test/db/version_5.rb
-- test/db/version_6.rb
-- test/install_generator_test.rb
-- test/test_helper.rb
-- test/upgrade_generator_test.rb
 homepage: https://github.com/collectiveidea/audited
 licenses:
 - MIT

data/.github/workflows/buildlight.yml

@@ -1,15 +0,0 @@
-name: Buildlight
-
-on:
-  workflow_run:
-    workflows:
-      - CI
-    branches:
-      - main
-
-jobs:
-  webhook:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Webhook
-        uses: collectiveidea/buildlight@main

data/.github/workflows/ci.yml

@@ -1,145 +0,0 @@
-name: CI
-
-on:
-  - pull_request
-  - push
-
-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, 3.2]
-        appraisal:
-          - rails50
-          - rails51
-          - rails52
-          - rails60
-          - rails61
-          - rails70
-          - rails71
-        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
-
-          # PostgreSQL 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
-          - appraisal: rails50
-            ruby: 3.2
-
-          # 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
-          - appraisal: rails51
-            ruby: 3.2
-
-          # 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
-          - appraisal: rails52
-            ruby: 3.2
-
-          # 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
-          - appraisal: rails60
-            ruby: 3.2
-
-          # 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
-
-          # 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
-        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/.github/workflows/publish_gem.yml

@@ -1,28 +0,0 @@
-name: Publish Gem
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  push:
-    if: github.repository == 'collectiveidea/audited'
-    runs-on: ubuntu-latest
-    environment: publishing
-
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      # Set up
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: ruby
-
-      # Release
-      - uses: rubygems/release-gem@v1

data/.gitignore

@@ -1,17 +0,0 @@
-*.iml
-*.ipr
-*.iws
-*.log
-*.swp
-.bundle
-.rakeTasks
-.ruby-gemset
-.ruby-version
-.rvmrc
-.yardoc
-doc/
-Gemfile.lock
-gemfiles/*.lock
-pkg
-tmp/*
-audited_test.sqlite3.db

data/.standard.yml

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

data/.yardopts

@@ -1,3 +0,0 @@
---no-private
---title acts_as_audited
---exclude lib/generators

data/gemfiles/rails50.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-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"
-
-gemspec name: "audited", path: "../"

data/gemfiles/rails51.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-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"
-
-gemspec name: "audited", path: "../"

data/gemfiles/rails52.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-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"
-gem "loofah", "2.20.0"
-
-gemspec name: "audited", path: "../"

data/gemfiles/rails60.gemfile

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

data/gemfiles/rails61.gemfile

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

data/gemfiles/rails70.gemfile

@@ -1,10 +0,0 @@
-# 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/gemfiles/rails71.gemfile

@@ -1,10 +0,0 @@
-# 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: "../"