audited 4.3.0 → 4.6.0

data/spec/support/active_record/models.rb

@@ -5,7 +5,7 @@ module Models
   module ActiveRecord
     class User < ::ActiveRecord::Base
       audited allow_mass_assignment: true, except: :password
-
+      attribute :non_column_attr if Rails.version >= '5.1'
       attr_protected :logins if respond_to?(:attr_protected)
 
       def name=(val)
@@ -15,6 +15,7 @@ module Models
 
     class UserOnlyPassword < ::ActiveRecord::Base
       self.table_name = :users
+      attribute :non_column_attr if Rails.version >= '5.1'
       audited allow_mass_assignment: true, only: :password
     end
 

data/spec/support/active_record/postgres/1_change_audited_changes_type_to_json.rb

@@ -0,0 +1,12 @@
+parent = Rails::VERSION::MAJOR == 4 ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+class ChangeAuditedChangesTypeToJson < parent
+  def self.up
+    remove_column :audits, :audited_changes
+    add_column :audits, :audited_changes, :json
+  end
+
+  def self.down
+    remove_column :audits, :audited_changes
+    add_column :audits, :audited_changes, :text
+  end
+end

data/spec/support/active_record/postgres/2_change_audited_changes_type_to_jsonb.rb

@@ -0,0 +1,12 @@
+parent = Rails::VERSION::MAJOR == 4 ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+class ChangeAuditedChangesTypeToJsonb < parent
+  def self.up
+    remove_column :audits, :audited_changes
+    add_column :audits, :audited_changes, :jsonb
+  end
+
+  def self.down
+    remove_column :audits, :audited_changes
+    add_column :audits, :audited_changes, :text
+  end
+end

data/spec/support/active_record/schema.rb

@@ -39,6 +39,7 @@ ActiveRecord::Schema.define do
     t.column :logins, :integer, default: 0
     t.column :created_at, :datetime
     t.column :updated_at, :datetime
+    t.column :favourite_device, :string
   end
 
   create_table :companies do |t|

data/test/install_generator_test.rb

@@ -7,11 +7,57 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
   tests Audited::Generators::InstallGenerator
 
-  test "should generate a migration" do
-    run_generator %w(install)
+  test "generate migration with 'text' type for audited_changes column" do
+    run_generator
 
     assert_migration "db/migrate/install_audited.rb" do |content|
-      assert_match(/class InstallAudited/, content)
+      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)
+
+    assert_migration "db/migrate/install_audited.rb" do |content|
+      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)
+
+    assert_migration "db/migrate/install_audited.rb" do |content|
+      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)
+
+    assert_migration "db/migrate/install_audited.rb" do |content|
+      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)
+
+    assert_migration "db/migrate/install_audited.rb" do |content|
+      assert_includes(content, 'class InstallAudited')
+      assert_includes(content, 't.column :user_id, :uuid')
+    end
+  end
+
+  test "generate migration with correct AR migration parent" do
+    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")
     end
   end
 end

data/test/upgrade_generator_test.rb

@@ -6,7 +6,11 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../tmp', __FILE__)
   setup :prepare_destination
   tests Audited::Generators::UpgradeGenerator
-  self.use_transactional_fixtures = false
+  if Rails::VERSION::MAJOR == 4
+    self.use_transactional_fixtures = false
+  else
+    self.use_transactional_tests = false
+  end
 
   test "should add 'comment' to audits table" do
     load_schema 1
@@ -74,4 +78,15 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
       assert_match(/add_index :audits, :request_uuid/, content)
     end
   end
+
+  test "generate migration with correct AR migration parent" do
+    load_schema 1
+
+    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")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,7 +24,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,21 +34,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: rails-observers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +58,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -82,7 +68,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +135,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -158,6 +144,8 @@ files:
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/audited-rspec.rb
 - lib/audited.rb
 - lib/audited/audit.rb
@@ -167,6 +155,7 @@ files:
 - lib/audited/version.rb
 - lib/generators/audited/install_generator.rb
 - lib/generators/audited/migration.rb
+- lib/generators/audited/migration_helper.rb
 - lib/generators/audited/templates/add_association_to_audits.rb
 - lib/generators/audited/templates/add_comment_to_audits.rb
 - lib/generators/audited/templates/add_remote_address_to_audits.rb
@@ -175,6 +164,7 @@ files:
 - lib/generators/audited/templates/rename_association_to_associated.rb
 - lib/generators/audited/templates/rename_changes_to_audited_changes.rb
 - 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
@@ -192,6 +182,8 @@ files:
 - 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
@@ -222,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Log all changes to your models

data/CHANGELOG

@@ -1,34 +0,0 @@
-Audited ChangeLog
--------------------------------------------------------------------------------
-* 2012-04-10 - Add Audit scopes for creates, updates and destroys [chriswfx]
-* 2011-10-25 - Made ignored_attributes configurable [senny]
-* 2011-09-09 - Rails 3.x support
-               Support for associated audits
-               Support for remote IP address storage
-               Plenty of bug fixes and refactoring
-               [kennethkalmer, ineu, PatrickMa, jrozner, dwarburton, bsiggelkow, dgm]
-* 2009-01-27 - Store old and new values for updates, and store all attributes on destroy.
-               Refactored revisioning methods to work as expected
-* 2008-10-10 - changed to make it work in development mode
-* 2008-09-24 - Add ability to record parent record of the record being audited
-               [Kenneth Kalmer]
-* 2008-04-19 - refactored to make compatible with dirty tracking in edge rails
-               and to stop storing both old and new values in a single audit
-* 2008-04-18 - Fix NoMethodError when trying to access the :previous revision
-               on a model that doesn't have previous revisions [Alex Soto]
-* 2008-03-21 - added #changed_attributes to get access to the changes before a
-               save [Chris Parker]
-* 2007-12-16 - Added #revision_at for retrieving a revision from a specific
-               time [Jacob Atzen]
-* 2007-12-16 - Fix error when getting revision from audit with no changes
-               [Geoffrey Wiseman]
-* 2007-12-16 - Remove dependency on acts_as_list
-* 2007-06-17 - Added support getting previous revisions
-* 2006-11-17 - Replaced use of singleton User.current_user with cache sweeper
-               implementation for auditing the user that made the change
-* 2006-11-17 - added migration generator
-* 2006-08-14 - incorporated changes from Michael Schuerig to write_attribute
-               that saves the new value after every change and not just the
-               first, and performs proper type-casting before doing comparisons
-* 2006-08-14 - The "changes" are now saved as a serialized hash
-* 2006-07-21 - initial version