audited 4.7.0 → 5.0.0

data/test/db/version_1.rb

@@ -11,7 +11,7 @@ ActiveRecord::Schema.define do
     t.column :created_at, :datetime
   end
 
-  add_index :audits, [:auditable_id, :auditable_type], name: 'auditable_index'
-  add_index :audits, [:user_id, :user_type], name: 'user_index'
+  add_index :audits, [:auditable_id, :auditable_type], name: "auditable_index"
+  add_index :audits, [:user_id, :user_type], name: "user_index"
   add_index :audits, :created_at
 end

data/test/db/version_2.rb

@@ -12,7 +12,7 @@ ActiveRecord::Schema.define do
     t.column :created_at, :datetime
   end
 
-  add_index :audits, [:auditable_id, :auditable_type], name: 'auditable_index'
-  add_index :audits, [:user_id, :user_type], name: 'user_index'
+  add_index :audits, [:auditable_id, :auditable_type], name: "auditable_index"
+  add_index :audits, [:user_id, :user_type], name: "user_index"
   add_index :audits, :created_at
 end

data/test/db/version_3.rb

@@ -12,8 +12,7 @@ ActiveRecord::Schema.define do
     t.column :created_at, :datetime
   end
 
-  add_index :audits, [:auditable_id, :auditable_type], name: 'auditable_index'
-  add_index :audits, [:user_id, :user_type], name: 'user_index'
+  add_index :audits, [:auditable_id, :auditable_type], name: "auditable_index"
+  add_index :audits, [:user_id, :user_type], name: "user_index"
   add_index :audits, :created_at
 end
-

data/test/db/version_4.rb

@@ -13,8 +13,7 @@ ActiveRecord::Schema.define do
     t.column :remote_address, :string
   end
 
-  add_index :audits, [:auditable_id, :auditable_type], name: 'auditable_index'
-  add_index :audits, [:user_id, :user_type], name: 'user_index'
+  add_index :audits, [:auditable_id, :auditable_type], name: "auditable_index"
+  add_index :audits, [:user_id, :user_type], name: "user_index"
   add_index :audits, :created_at
 end
-

data/test/db/version_5.rb

@@ -15,4 +15,3 @@ ActiveRecord::Schema.define do
     t.column :association_type, :string
   end
 end
-

data/test/db/version_6.rb

@@ -14,4 +14,6 @@ ActiveRecord::Schema.define do
     t.column :associated_id, :integer
     t.column :associated_type, :string
   end
+
+  add_index :audits, [:auditable_type, :auditable_id], name: "auditable_index"
 end

data/test/install_generator_test.rb

@@ -1,9 +1,9 @@
-require 'test_helper'
+require "test_helper"
 
-require 'generators/audited/install_generator'
+require "generators/audited/install_generator"
 
 class InstallGeneratorTest < Rails::Generators::TestCase
-  destination File.expand_path('../../tmp', __FILE__)
+  destination File.expand_path("../../tmp", __FILE__)
   setup :prepare_destination
   tests Audited::Generators::InstallGenerator
 
@@ -11,44 +11,44 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     run_generator
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      assert_includes(content, 'class InstallAudited')
-      assert_includes(content, 't.column :audited_changes, :text')
+      assert_includes(content, "class InstallAudited")
+      assert_includes(content, "t.column :audited_changes, :text")
     end
   end
 
   test "generate migration with 'jsonb' type for audited_changes column" do
-    run_generator %w(--audited-changes-column-type jsonb)
+    run_generator %w[--audited-changes-column-type jsonb]
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      assert_includes(content, 'class InstallAudited')
-      assert_includes(content, 't.column :audited_changes, :jsonb')
+      assert_includes(content, "class InstallAudited")
+      assert_includes(content, "t.column :audited_changes, :jsonb")
     end
   end
 
   test "generate migration with 'json' type for audited_changes column" do
-    run_generator %w(--audited-changes-column-type json)
+    run_generator %w[--audited-changes-column-type json]
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      assert_includes(content, 'class InstallAudited')
-      assert_includes(content, 't.column :audited_changes, :json')
+      assert_includes(content, "class InstallAudited")
+      assert_includes(content, "t.column :audited_changes, :json")
     end
   end
 
   test "generate migration with 'string' type for user_id column" do
-    run_generator %w(--audited-user-id-column-type string)
+    run_generator %w[--audited-user-id-column-type string]
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      assert_includes(content, 'class InstallAudited')
-      assert_includes(content, 't.column :user_id, :string')
+      assert_includes(content, "class InstallAudited")
+      assert_includes(content, "t.column :user_id, :string")
     end
   end
 
   test "generate migration with 'uuid' type for user_id column" do
-    run_generator %w(--audited-user-id-column-type uuid)
+    run_generator %w[--audited-user-id-column-type uuid]
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      assert_includes(content, 'class InstallAudited')
-      assert_includes(content, 't.column :user_id, :uuid')
+      assert_includes(content, "class InstallAudited")
+      assert_includes(content, "t.column :user_id, :uuid")
     end
   end
 
@@ -56,8 +56,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     run_generator
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      parent = Rails::VERSION::MAJOR == 4 ? 'ActiveRecord::Migration' : "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
-      assert_includes(content, "class InstallAudited < #{parent}\n")
+      assert_includes(content, "class InstallAudited < ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]\n")
     end
   end
 end

data/test/test_helper.rb

@@ -1,19 +1,18 @@
-ENV['RAILS_ENV'] = 'test'
+ENV["RAILS_ENV"] = "test"
 
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
-require File.expand_path('../../spec/rails_app/config/environment', __FILE__)
-require 'rails/test_help'
+require File.expand_path("../../spec/rails_app/config/environment", __FILE__)
+require "rails/test_help"
 
-require 'audited'
+require "audited"
 
 class ActiveSupport::TestCase
-
   setup do
     ActiveRecord::Migration.verbose = false
   end
 
-  def load_schema( version )
+  def load_schema(version)
     load File.dirname(__FILE__) + "/db/version_#{version}.rb"
   end
 end

data/test/upgrade_generator_test.rb

@@ -1,21 +1,17 @@
-require 'test_helper'
+require "test_helper"
 
-require 'generators/audited/upgrade_generator'
+require "generators/audited/upgrade_generator"
 
 class UpgradeGeneratorTest < Rails::Generators::TestCase
-  destination File.expand_path('../../tmp', __FILE__)
+  destination File.expand_path("../../tmp", __FILE__)
   setup :prepare_destination
   tests Audited::Generators::UpgradeGenerator
-  if Rails::VERSION::MAJOR == 4
-    self.use_transactional_fixtures = false
-  else
-    self.use_transactional_tests = false
-  end
+  self.use_transactional_tests = false
 
   test "should add 'comment' to audits table" do
     load_schema 1
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_migration "db/migrate/add_comment_to_audits.rb" do |content|
       assert_match(/add_column :audits, :comment, :string/, content)
@@ -27,7 +23,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
   test "should rename 'changes' to 'audited_changes'" do
     load_schema 2
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_no_migration "db/migrate/add_comment_to_audits.rb"
 
@@ -39,7 +35,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
   test "should add a 'remote_address' to audits table" do
     load_schema 3
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_migration "db/migrate/add_remote_address_to_audits.rb" do |content|
       assert_match(/add_column :audits, :remote_address, :string/, content)
@@ -49,7 +45,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
   test "should add 'association_id' and 'association_type' to audits table" do
     load_schema 4
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_migration "db/migrate/add_association_to_audits.rb" do |content|
       assert_match(/add_column :audits, :association_id, :integer/, content)
@@ -60,7 +56,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
   test "should rename 'association_id' to 'associated_id' and 'association_type' to 'associated_type'" do
     load_schema 5
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_migration "db/migrate/rename_association_to_associated.rb" do |content|
       assert_match(/rename_column :audits, :association_id, :associated_id/, content)
@@ -71,7 +67,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
   test "should add 'request_uuid' to audits table" do
     load_schema 6
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_migration "db/migrate/add_request_uuid_to_audits.rb" do |content|
       assert_match(/add_column :audits, :request_uuid, :string/, content)
@@ -79,14 +75,23 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  test "should add 'version' to auditable_index" do
+    load_schema 6
+
+    run_generator %w[upgrade]
+
+    assert_migration "db/migrate/add_version_to_auditable_index.rb" do |content|
+      assert_match(/add_index :audits, \[:auditable_type, :auditable_id, :version\]/, content)
+    end
+  end
+
   test "generate migration with correct AR migration parent" do
     load_schema 1
 
-    run_generator %w(upgrade)
+    run_generator %w[upgrade]
 
     assert_migration "db/migrate/add_comment_to_audits.rb" do |content|
-      parent = Rails::VERSION::MAJOR == 4 ? 'ActiveRecord::Migration' : "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
-      assert_includes(content, "class AddCommentToAudits < #{parent}\n")
+      assert_includes(content, "class AddCommentToAudits < ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]\n")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,10 +10,10 @@ authors:
 - Brian Ryckbost
 - Steve Richert
 - Ryan Glover
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,20 +21,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -55,34 +55,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -101,30 +129,36 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Log all changes to your models
 email: info@collectiveidea.com
 executables: []
@@ -132,6 +166,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".standard.yml"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
@@ -140,16 +175,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
 - lib/audited-rspec.rb
 - lib/audited.rb
 - lib/audited/audit.rb
 - lib/audited/auditor.rb
+- lib/audited/railtie.rb
 - lib/audited/rspec_matchers.rb
 - lib/audited/sweeper.rb
 - lib/audited/version.rb
@@ -160,6 +195,7 @@ files:
 - lib/generators/audited/templates/add_comment_to_audits.rb
 - lib/generators/audited/templates/add_remote_address_to_audits.rb
 - lib/generators/audited/templates/add_request_uuid_to_audits.rb
+- lib/generators/audited/templates/add_version_to_auditable_index.rb
 - lib/generators/audited/templates/install.rb
 - lib/generators/audited/templates/rename_association_to_associated.rb
 - lib/generators/audited/templates/rename_changes_to_audited_changes.rb
@@ -170,12 +206,12 @@ files:
 - 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/development.rb
-- spec/rails_app/config/environments/production.rb
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/initializers/backtrace_silencers.rb
 - spec/rails_app/config/initializers/inflections.rb
@@ -199,7 +235,7 @@ homepage: https://github.com/collectiveidea/audited
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,16 +243,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Log all changes to your models
 test_files: []